Fixed location and fixed factory.xml