Modify to reflect API change