Improed Cmd_options