Feature/new hibernate