Switched back to separate event & stream tables