Fix: Core, index, Add: Cli