added support of attributes