Adding basic response capability