Support newer software