Adds data attributes support and unifies some attributes in one var.