Updated to include correct response headers