Consolidate Room from memory object into record
Refactor EventSource