Switched back to Hibernate, some tuning