Added more TnT extensions