Refactoring client-side port
Refactoring client-side port