Added phone number generator and nullable support