client entity and client helper have been added