Hide ClientFactory, add SessionFactory