Adding mapper code
Correcting string formatting.