Started adding item support