Proper initialization needed for CLI mode