Feature/new cspecs