adjusted config structures