Changes to the Exit class