Separation to read better
Adapt new configs