Adding local item support