Added support for USE