Added base model and template