- added proper phone number management