Add missing options to CLI