Added more waiting time for server