Some changes for regexp