Many changes esp use of spring data repositories