Make loaderFile optional; Destillate of #13, #14 and #18

Destillate of #13, #14 and #18