Added variable handling of PhoneNumber and BlockNumber