Added models, templates, static