Major revision to the alias structure