Added templates and view definitions