Map enable/disable added.
Merge branch 'Front-End-Work'