Modified items for new directive usage.