diff --git a/frame.go b/frame.go
index 7c785aaa0..081f71700 100644
--- a/frame.go
+++ b/frame.go
@@ -924,10 +924,10 @@ func encodeFrames(a []*Frame) []*internal.Frame {
 
 // encodeFrame converts f into its internal representation.
 func encodeFrame(f *Frame) *internal.Frame {
-	options := f.Options()
+	fo := f.options()
 	return &internal.Frame{
 		Name: f.name,
-		Meta: options.Encode(),
+		Meta: fo.Encode(),
 	}
 }
 
diff --git a/index.go b/index.go
index d04a1871b..67aae389d 100644
--- a/index.go
+++ b/index.go
@@ -614,12 +614,10 @@ func EncodeIndexes(a []*Index) []*internal.Index {
 
 // encodeIndex converts d into its internal representation.
 func encodeIndex(d *Index) *internal.Index {
+	io := d.options()
 	return &internal.Index{
-		Name: d.name,
-		Meta: &internal.IndexMeta{
-			ColumnLabel: d.columnLabel,
-			TimeQuantum: string(d.timeQuantum),
-		},
+		Name:     d.name,
+		Meta:     io.Encode(),
 		MaxSlice: d.MaxSlice(),
 		Frames:   encodeFrames(d.Frames()),
 	}