Add primitive client for testing