Going to make some major changes to hibernate mapping