Updated for latest library changes