Full Attribute support, better comments and names