Updated template to match new scheme