Commands changed
Exception handling changed