Start the POD refactoring