Update for user library use