Source Type & response codes fixed