Add timeout paarmetrs to some functions