Initial support for fallback CLI arguments