Anders refactor event model