Reduce dependency on Loader and Factory.