Added response wrapper