- Added hibernate support