Changed from JAXB objects to hibernate O/RM objects.