Improve tramp support