Imporoved regular expressions