Added some files and factories.