Added element name check