Refactored charge response objects