Added methods to domain classes