Changes to match the new library format & functions