Added models for user and event