Enhance enviroment for differences in systems