Updated EnviroShaftCreationHandler