Client store support. Issue #66