Add proper alias handling