With the refactor of the runner, this thing became much more simple!

Signed-off-by: Ozan Turgut <ozanturgut@gmail.com>