Hibernate mapping optimisation
Quick fix for tests