Added support to EventStoreFactory
Added support to EventStoreFactory