Fixing scheme to schema