Refactored client to use request profiler
Merged changes