moved map and unmap method to the service
Merge remote-tracking branch 'origin/develop' into develop