use findEntity and findEntities from the mapper class to get rid of code duplication