Added more params for tun class