Added PersistencyLayer & Added scope-management for events