Refactored Watcher class and moved functions for creating and updating datapoints to the Watcher class, simplified watcher registration. Added tracking of key frequencies.