Update to work with the new runtime