Feature/api work package embedded watchers