Added default timeout