Updated match strings to contain group definitions
Update again the regex strings
Made regex match strings literal strings, Add substitution commands