Added regex capturing groups