Reverted to using the REST API