Update watch usage
Add Comand subclass and property parsing