Added support for aliases