Implemented env. in analysis and updated env. to handle modules and classes