Updated schema to match front-end fixes