Working in Envision refactoring