Added better support for tramp