update with latest schema changes