Added methods to domain classes
More changes to use the spring jpa classes