Added persistence abstraction
Updated event dispatcher adapter