Added PhoneNumber db storing as None
Updated version