Changed getItem() implementation