CLI option builders refactored