Added support for 1-level aliases