BAP-6590: Base Client Side Architecture

 - fixed review comments