Adding aliases and supporting data