Added timeout to callback