Add ability to edit Name and Type properties