Updated for final API revision.