Added custom model and template