Updated schema, fixed errors