Add support for work attributes