Updated conversion routines