added better support for new configuration