PIM-3024: Add numbers to regex