Update to work with latest version