Updated schema to latest