Change *watch to use AddCommand instead of parsing OnModCommand