Continue implementation of Hibernate.

PreviousRule1 is broken and needs fixing,
currently it creates circular references