Now using a generic Mapper and Service (updated pom also.)