Fix: cli interface and web interface