HHH-3051 corrected Loader returnTypes