Added suppport for timed out solutions