Add capture group verification