New timeout check and improved imports.