Updates to 'convert' methods