Update regex to support dots and spaces