Add the watchers into the sub directives to remove the gross timeout hack