Added Response handling