more needed schema changes