Completely converted to hibernate