improve Settings
add EventStoreExtension