Enhanced client