make compatible with latest schema