diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index f2455cc..fb0d39d 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -12,10 +12,18 @@
 #
 class rhizo_base::freeswitch {
 
-  $pgsql_db   = $rhizo_base::pgsql_db
-  $pgsql_user = $rhizo_base::pgsql_user
-  $pgsql_pwd  = $rhizo_base::pgsql_pwd
-  $pgsql_host = $rhizo_base::pgsql_host
+  $pgsql_db       = $rhizo_base::pgsql_db
+  $pgsql_user     = $rhizo_base::pgsql_user
+  $pgsql_pwd      = $rhizo_base::pgsql_pwd
+  $pgsql_host     = $rhizo_base::pgsql_host
+
+  $vpn_ip_address = $rhizo_base::vpn_ip_address
+  $wan_ip_address = $rhizo_base::wan_ip_address
+
+  $voip_username  = $rhizo_base::voip_username
+  $voip_fromuser  = $rhizo_base::voip_fromuser
+  $voip_password  = $rhizo_base::voip_password
+  $voip_proxy     = $rhizo_base::voip_proxy
 
   package {
     ['freeswitch', 'freeswitch-lang-en',
diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index 7d2088a..bea2e76 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -11,6 +11,19 @@
 # Sample Usage:
 #
 class rhizo_base::openbsc {
+  $network_name    = $rhizo_base::network_name
+  $auth_policy     = $rhizo_base::auth_policy
+  $max_power_red   = $rhizo_base::max_power_red
+  $arfcn_A         = $rhizo_base::arfcn_A
+  $arfcn_B         = $rhizo_base::arfcn_B
+  $arfcn_C         = $rhizo_base::arfcn_C
+  $arfcn_D         = $rhizo_base::arfcn_D
+  $arfcn_E         = $rhizo_base::arfcn_E
+  $arfcn_F         = $rhizo_base::arfcn_F
+  $bts2_ip_address = $rhizo_base::bts2_ip_address
+  $bts3_ip_address = $rhizo_base::bts3_ip_address
+  $smsc_password   = $rhizo_base::smsc_password
+
   package { ['osmocom-nitb', 'osmocom-nitb-dbg',
   'libdbd-sqlite3', 'libsmpp0']:
       ensure  => installed,