Add support for local aliases