Added map instruction
Persist env from context