Add attributes support