Update CLI for new interface structure