Moved exceptions
New way of defining commands