Conversion Support

Adding additional logic to aid in the conversion support