Event refactoring. Content module