Fix hibernate mapping