Improve base response format