Reworked configuration