Updated to reflect recent item API changes