- Added environment to user defined types
- Added separated object context