updated hibernate generation strategy
merge