Feature/hibernate builder