Modify some codes for response format