Now handles items as well