Major config reworking