Adding better regex