HandleAdd and HandleResponse
Refactor some variables