Added wrapper to workspace. The context managment works