Added missing Override annotation
Further Hibernate additions