Updated for new library changes