UPD: Client params management refactored