Add support for Attributes