initial modifications to add multi config