Added support for attributes