Reworked configuration to make it simpler