Improve aliases structure