Make more use of Pair<String,String> instead of String[2]