Remove alias setter to avoid confusion
Add aliases definitions