Update to use new activity scope.
Update to fix class options assignment.
Add watching api specs.