Added builtin support for aliases