Added names editing feature