Add Name attribute and functionality