Refactored feature back determination in convert org