Adding aliases and fixing index