Updates for library changes