Support latest schema changes.