[Enhancement] Initial client side logic