Replace custom logic with simple-cli