Cvar uses new mapping. Started declaring more 1-to-1 mappings.