extended autodiscovery;
added config layer;
adjusted other code to use config layer;