Update for library use