Add item-in-hand support