Added 2 more regex capture groups