More Charge Pad refactoring