adding support for more attributes