Preparing config for better modularity