Add handling for runner and wheel