Fixed some issues with the module event hooks. Made the mapper event triggers a bit more consistent