Event content type refactor