Finish CLI implementation