Changed some regular expressions to cature maps