Updated runner and database select method