Export Client along with the Mapper

The client is a very powerful class, and it would be great to expose it.