Fixed cli interface