Add Response + some fixes