Reworked client impl of interest