New handling of configuration. Now uses Regex.