Added support for qualified usage and generation