Updating data classes to use hibernate