MakeMapping added

Added the makeMapping method. Reem please test.