T258: refactor creation of new cspaces to make it cleaner