Added proper support for changing of configurations in and between sessions