Changing database structure to be hibernate friendly :(