Make runners and servers instance based