* Added MAPA Support
* More code cleanup