Improvents due to new Hibernate version