Updated mapper
Updated settings service
Dev updates
CS fixes
Added event