Redesign of the aliases function