added support for workitem types
merge issues: sync cf, add new comments