merged base-model-hibernate in base-model