Updates on tunnel class