Improved Attributes Definition by splitting #attribute logic into smaller classes