add attributes support