further configuration modularization