Add Status and exit codes