Update to recommended Attribute List & Small bugfix for adding Attributes