Update for latest schema