In general I'd like to keep all HQL into the model classes, we should move this.