Incorporate timeout