Used non-capturing group in regexp to extend the API