Added timeouts and delete method