Entity files are now loaded once
Factory back again, oh yes