Added attributes, sets, edit/add