Added StartupListener