Added support for more attribute types.

---

Known issues:

- Need to add support for attribute [#% <description>]