Added support for multiple configurations