Added support for shortName