add support for aliases