Split Updater and Listener in two classes