Added models, context, and organizer classes