fixed to include Hibernate stuff