This change reorder the parameters so that we get the mandatory one at the top, then alphabetically order the other bellow. It also adds the returned values.