Add timeout possibility