Added more fine-grained timeouts