Improvments in hibernate mapper