Added support for some attributes