Refactor and adding placeholder classes for alternative hydration strategies