Reworked config