better support for re-configuration