object mapping should work with server model
minor code moving