Added named captures to regex