Update to work with API