Cli - added support for custom usage.