added support for workspace