Add feature switch for org