UPDATED: Common non reg for hibernate