Adjusted some codes and added domain info details to response