adding map
Added manual map support