modify client add handler logic