Changes to Alias API after discussion with Fernando