added forgotten templates and model fix