Added more NFA generation