Adding static commandline and startup_shutdown handling