Added Commands and new Exception Type Handler