WPP settings refactoring (WIP)