Fix #70 - Change client definition and adds update ability