Updated for refactor of item structure