Add watcher field, alter constant field for sorting purpose