Added server response support