More changes to swagger schemas