Update for library changes