Adding client/lib back in