added support for aliases