Updates needed for CLI