Removed javafx.util.Pair dependency