Added an ugly mechanism to support aliases.