Removed dependency on EventStore
Class renamed
Class renamed