Added Add/Remove attribute Support