Added hibernate support