Updated Response Builder