Add more hibernate support