Futureproofing compatibility