Start adding hibernate support