Updated new schema