Added support for naming alias