Optimized the number of watch created.
Allow settings of properties.
Removed unused 'requires' arguments.