Updating Client class to nap2