Moving forward with hibernate conversion little by little.