Bug 2508

Added templates.