Refactored ore to have a shared parent type