Added support for global aliases