[Tunji] X changes the phone validator to be modular