Client side refactoring