Updated template to match REGEX