Added separate environment support
Changed name of module and added description