Added support for workflows