Update schema, correct conditions.