Feature/api work package embedded watchers

Yeah... It is not.. Thanks ;)