Develop with updated environment construction and classes