Response handler enhancement