Refactored events, made data models