As I mentioned on the PR, why not just hook this CustomLoader factory method into the org.hibernate.engine.query.spi.NativeQueryInterpreter SPI that OGM already supplies for handling aspects of NativeQuery interpretation? Seems like a much cleaner solution