Split mapping Map method into Create and Map