Removed the necessity of all xml files