Updated conversion tables