MapState and Map comments added