Move OpenJPA enhancement to the correct place