improve Runner api