better modularisation of config