Converted to Hibernate Annotations and relatively stable now.