Adjust to schema change