Added model and context classes