Some work towards handling newer available editions