Updated Ore Factory to reflect actual structure