add elements
move attributes extension inside class