Adding base client upsert support
Fixes #11