Rework resolver / validation handling
Rework config change handling, yet again