HHH-3051 corrected CustomLoader returnTypes (different approach)