Added comments as required, except for JSON and XML