adding support for attributes