Enhanced data modelling and hibernate integration