Added attributes to items as well