Added classes and attributes to Names