Updated watch spec.
Added watch factory.