made some changes in the way maps are getting initialize