Use model in data mapper and removed call to fetch