Improve error handling
Improve the command interface