added beanpropertyrowmapper istead of doing the mapping myself