Thanks Gail. Using annotations seems to work for both Hibernate 4 and 5, with some initial testing in this commit.