Use FallbackHandler in the CLI tool - #6