Refactor partner_spec & fix province factory