Command line controller updates + Kernel for CLI usage