Updated to reflect the list API changes.