Adding alias support and a couple of aliases.