Added map and defer methods