Added next batch of changes to the loader in preparation for 20150128