Moved response_with_add_on to valuable concern