Added support for internal and external aliases