Added more response keys