Add aliases and NOTE