ClientSide refactoring.