Support newer versions