Update calls to conversion function