Update to match library API