added support for different configurations