Refactored some of server to data mapper helper