[Resolver] #77 Mostly implemented new way of treating aliases.