Change schema and fix specs.