Updated for signature changes