updated with hibername support