Added attributeName handler