diff --git a/pkg/proto/v0/settings.pb.go b/pkg/proto/v0/settings.pb.go
index f49d5264d..cab748b43 100644
--- a/pkg/proto/v0/settings.pb.go
+++ b/pkg/proto/v0/settings.pb.go
@@ -741,6 +741,7 @@ type ListOption struct {
 	//	*ListOption_IntValue
 	Option               isListOption_Option `protobuf_oneof:"option"`
 	Selected             bool                `protobuf:"varint,3,opt,name=selected,proto3" json:"selected,omitempty"`
+	DisplayValue         string              `protobuf:"bytes,4,opt,name=displayValue,proto3" json:"displayValue,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
 	XXX_sizecache        int32               `json:"-"`
@@ -815,6 +816,13 @@ func (m *ListOption) GetSelected() bool {
 	return false
 }
 
+func (m *ListOption) GetDisplayValue() string {
+	if m != nil {
+		return m.DisplayValue
+	}
+	return ""
+}
+
 // XXX_OneofWrappers is for the internal use of the proto package.
 func (*ListOption) XXX_OneofWrappers() []interface{} {
 	return []interface{}{
@@ -845,48 +853,49 @@ func init() {
 }
 
 var fileDescriptor_199e73d7d5fd837b = []byte{
-	// 684 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x5d, 0x6f, 0xd3, 0x4a,
-	0x10, 0xad, 0xeb, 0xa4, 0x71, 0x26, 0x6a, 0x6f, 0xbb, 0xb7, 0xf7, 0x5e, 0xdf, 0xb4, 0x40, 0x58,
-	0x1e, 0x40, 0x20, 0x35, 0xa8, 0xbc, 0x20, 0x24, 0x84, 0x94, 0x0a, 0x28, 0x50, 0x8a, 0xb4, 0x95,
-	0xfa, 0x50, 0x15, 0x90, 0x9b, 0x0c, 0xe9, 0xaa, 0x8e, 0xed, 0x7a, 0x37, 0x55, 0xfa, 0xc6, 0x2f,
-	0xe0, 0x4f, 0x80, 0xf8, 0x9d, 0xc8, 0x63, 0x3b, 0xfe, 0x88, 0x53, 0xb5, 0x82, 0xa7, 0xac, 0x67,
-	0xce, 0x39, 0x73, 0x32, 0xb3, 0x1f, 0xb0, 0x11, 0x9c, 0x0d, 0xbb, 0x41, 0xe8, 0x6b, 0xbf, 0x7b,
-	0xf1, 0xb8, 0xab, 0x50, 0x6b, 0xe9, 0x0d, 0xd5, 0x16, 0x45, 0x58, 0x9d, 0x7e, 0xf8, 0x31, 0x6c,
-	0xec, 0x84, 0xe8, 0x68, 0x3c, 0x48, 0xd2, 0xbd, 0xb1, 0x37, 0x70, 0x51, 0xe0, 0xf9, 0x18, 0x95,
-	0x66, 0xcf, 0x61, 0x45, 0x15, 0x12, 0xb6, 0xd1, 0x31, 0x1e, 0xb4, 0xb6, 0xff, 0x89, 0x55, 0xb6,
-	0x4a, 0xac, 0x12, 0x98, 0x7f, 0x84, 0xcd, 0x6a, 0x75, 0x15, 0xf8, 0x9e, 0xc2, 0xdf, 0x95, 0x7f,
-	0x0b, 0xf6, 0x6b, 0xd4, 0xd5, 0xce, 0x37, 0xa1, 0x89, 0x13, 0x8d, 0x9e, 0x92, 0xbe, 0x47, 0xaa,
-	0x4d, 0x91, 0x05, 0xd8, 0x2a, 0x98, 0x67, 0x78, 0x69, 0x2f, 0x52, 0x3c, 0x5a, 0xf2, 0x23, 0xf8,
-	0xbf, 0x42, 0xeb, 0xcf, 0xf8, 0x7c, 0x06, 0xed, 0x3d, 0xa9, 0x4a, 0xe2, 0xea, 0x5a, 0x4e, 0xf9,
-	0x27, 0xd8, 0xa8, 0xe4, 0x26, 0xce, 0x5e, 0xc0, 0x5f, 0xc5, 0x62, 0xca, 0x36, 0x3a, 0xe6, 0x7c,
-	0x6b, 0x65, 0x34, 0xff, 0x66, 0xc0, 0x4a, 0x11, 0x73, 0xd3, 0xd6, 0xb1, 0x0e, 0xb4, 0x06, 0x52,
-	0x05, 0xae, 0x73, 0xb9, 0xef, 0x8c, 0xd0, 0x36, 0x29, 0x93, 0x0f, 0xb1, 0x87, 0x60, 0xa5, 0x75,
-	0xed, 0x1a, 0xd9, 0x5b, 0x29, 0xda, 0x13, 0xd3, 0x3c, 0xff, 0x61, 0x42, 0x23, 0x89, 0xa6, 0xb5,
-	0x8c, 0xb9, 0xb5, 0x16, 0x67, 0x6b, 0x45, 0x08, 0x54, 0xfd, 0x50, 0x06, 0x3a, 0xf2, 0x9f, 0xba,
-	0xc9, 0x42, 0xac, 0x0b, 0x96, 0xf4, 0xf4, 0xa1, 0xe3, 0x8e, 0xd1, 0xae, 0xd1, 0x1c, 0xd7, 0x12,
-	0x37, 0x6f, 0xbc, 0xb4, 0xd1, 0xbb, 0x0b, 0x62, 0x0a, 0x62, 0x4f, 0xa1, 0xa5, 0x74, 0x28, 0xbd,
-	0x61, 0xcc, 0xa9, 0x13, 0x67, 0x3d, 0xfd, 0x07, 0x94, 0xc9, 0x68, 0x79, 0x28, 0xdb, 0x86, 0xe6,
-	0x89, 0xef, 0xbb, 0x31, 0x6f, 0x89, 0x78, 0x2c, 0xe1, 0xf5, 0x7c, 0xdf, 0xcd, 0x58, 0x19, 0x8c,
-	0xed, 0xc3, 0x9a, 0x92, 0xde, 0xd0, 0xc5, 0x9d, 0x53, 0x5f, 0xf6, 0x31, 0xe6, 0x36, 0x88, 0x7b,
-	0x3b, 0xad, 0x99, 0xcb, 0xe7, 0x76, 0xc7, 0xee, 0x82, 0x98, 0xa5, 0xb2, 0x77, 0xb0, 0x3a, 0x1a,
-	0xbb, 0x5a, 0xe6, 0xe5, 0x2c, 0x92, 0xbb, 0x95, 0xc8, 0xbd, 0xcf, 0xd2, 0x45, 0xb5, 0x19, 0x62,
-	0xaf, 0x01, 0xf5, 0x8b, 0x68, 0xc1, 0xbf, 0x1a, 0x00, 0x59, 0xbb, 0x98, 0x0d, 0x8d, 0x01, 0x7e,
-	0x71, 0xc6, 0xae, 0xa6, 0x69, 0x99, 0x22, 0xfd, 0x8c, 0x66, 0x38, 0x92, 0x1e, 0x4d, 0xca, 0x14,
-	0xd1, 0x92, 0x22, 0xce, 0x84, 0x26, 0x13, 0x45, 0x9c, 0x09, 0x63, 0x50, 0x53, 0x1a, 0x03, 0x9a,
-	0x86, 0x29, 0x68, 0x1d, 0xcd, 0x31, 0x70, 0x9d, 0x3e, 0x9e, 0xfa, 0xee, 0x00, 0x43, 0x6a, 0x7a,
-	0x53, 0xe4, 0x43, 0xfc, 0xbb, 0x01, 0xcb, 0x85, 0xee, 0x97, 0x5d, 0x34, 0x33, 0x17, 0x6d, 0xb0,
-	0x42, 0x3c, 0x1f, 0xcb, 0x10, 0x07, 0x64, 0xc5, 0x12, 0xd3, 0xef, 0x68, 0xbf, 0x8f, 0xa4, 0xb7,
-	0x87, 0xde, 0x50, 0x9f, 0x92, 0xab, 0xba, 0xc8, 0x02, 0x94, 0x75, 0x26, 0x49, 0xb6, 0x96, 0x64,
-	0xd3, 0xc0, 0x35, 0x5c, 0xde, 0x87, 0x56, 0x6e, 0xd4, 0x65, 0x8b, 0xd6, 0xd4, 0x22, 0x7f, 0x05,
-	0xff, 0xcd, 0x99, 0x2b, 0x7b, 0x04, 0x0d, 0x9f, 0xf6, 0x6e, 0x7a, 0xba, 0xd3, 0x0d, 0x1b, 0x81,
-	0x3e, 0x50, 0x46, 0xa4, 0x08, 0xfe, 0x12, 0xfe, 0xad, 0x1e, 0xe8, 0xcd, 0x64, 0x34, 0x40, 0x16,
-	0x66, 0xbc, 0x78, 0x04, 0xa8, 0xbb, 0xe5, 0xcd, 0xbe, 0x99, 0x3b, 0x57, 0x34, 0xee, 0xc2, 0x21,
-	0x6a, 0x47, 0x77, 0x80, 0x8b, 0x7d, 0x8d, 0x03, 0x6a, 0xb2, 0x25, 0xa6, 0xdf, 0x3d, 0x0b, 0x96,
-	0xe2, 0xb2, 0xdb, 0x3f, 0x17, 0x61, 0x39, 0xbe, 0x86, 0x0e, 0x30, 0xbc, 0x90, 0x7d, 0x64, 0x9f,
-	0x61, 0xbd, 0xea, 0x0d, 0x61, 0x3c, 0xf1, 0x7e, 0xc5, 0xf3, 0xd5, 0xbe, 0x77, 0x25, 0x26, 0xb9,
-	0x42, 0x0f, 0x61, 0x6d, 0xe6, 0xe6, 0x67, 0x77, 0x12, 0xe6, 0xbc, 0xf7, 0xa5, 0xdd, 0x99, 0x0f,
-	0x48, 0x74, 0x8f, 0xe1, 0xef, 0x8a, 0x9b, 0x9b, 0xdd, 0xcd, 0xf5, 0xbc, 0xfa, 0x45, 0x68, 0xf3,
-	0xab, 0x20, 0xb1, 0x7a, 0xaf, 0x71, 0x14, 0xbf, 0xe0, 0x27, 0x4b, 0xf4, 0xf3, 0xe4, 0x57, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0x2b, 0x5c, 0xdc, 0x93, 0xee, 0x07, 0x00, 0x00,
+	// 695 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0xd3, 0x4e,
+	0x10, 0xad, 0x9b, 0xa4, 0x71, 0x26, 0xbf, 0xf6, 0xd7, 0x2e, 0x05, 0x4c, 0x5a, 0x20, 0x2c, 0x07,
+	0x10, 0x48, 0x0d, 0x2a, 0x17, 0x84, 0x84, 0x90, 0x52, 0x01, 0x05, 0x4a, 0x91, 0xb6, 0x52, 0x0f,
+	0x55, 0x01, 0xb9, 0xc9, 0x90, 0xae, 0xea, 0xd8, 0xae, 0x77, 0x53, 0xa5, 0x37, 0x3e, 0x01, 0x67,
+	0xee, 0x20, 0x3e, 0x27, 0xf2, 0xd8, 0x8e, 0xff, 0xc4, 0xa9, 0x5a, 0xc1, 0xc9, 0xbb, 0x6f, 0xe6,
+	0xbd, 0x7d, 0x9e, 0xd9, 0x3f, 0xb0, 0xe6, 0x9f, 0x0c, 0x3a, 0x7e, 0xe0, 0x69, 0xaf, 0x73, 0xf6,
+	0xa4, 0xa3, 0x50, 0x6b, 0xe9, 0x0e, 0xd4, 0x06, 0x21, 0xac, 0x46, 0x1f, 0x7e, 0x08, 0x6b, 0x5b,
+	0x01, 0xda, 0x1a, 0xf7, 0xe2, 0x70, 0x77, 0xe4, 0xf6, 0x1d, 0x14, 0x78, 0x3a, 0x42, 0xa5, 0xd9,
+	0x0b, 0x58, 0x52, 0xb9, 0x80, 0x65, 0xb4, 0x8d, 0x87, 0xcd, 0xcd, 0xeb, 0x91, 0xca, 0x46, 0x81,
+	0x55, 0x48, 0xe6, 0x9f, 0x60, 0xbd, 0x5c, 0x5d, 0xf9, 0x9e, 0xab, 0xf0, 0x6f, 0xe5, 0xdf, 0x81,
+	0xf5, 0x06, 0x75, 0xb9, 0xf3, 0x75, 0x68, 0xe0, 0x58, 0xa3, 0xab, 0xa4, 0xe7, 0x92, 0x6a, 0x43,
+	0xa4, 0x00, 0x5b, 0x86, 0xca, 0x09, 0x9e, 0x5b, 0xf3, 0x84, 0x87, 0x43, 0x7e, 0x00, 0xb7, 0x4a,
+	0xb4, 0xfe, 0x8d, 0xcf, 0xe7, 0xd0, 0xda, 0x91, 0xaa, 0x20, 0xae, 0x2e, 0xe5, 0x94, 0x7f, 0x86,
+	0xb5, 0x52, 0x6e, 0xec, 0xec, 0x25, 0xfc, 0x9f, 0x5f, 0x4c, 0x59, 0x46, 0xbb, 0x32, 0xdb, 0x5a,
+	0x31, 0x9b, 0x7f, 0x37, 0x60, 0x29, 0x9f, 0x73, 0xd5, 0xd2, 0xb1, 0x36, 0x34, 0xfb, 0x52, 0xf9,
+	0x8e, 0x7d, 0xbe, 0x6b, 0x0f, 0xd1, 0xaa, 0x50, 0x24, 0x0b, 0xb1, 0x47, 0x60, 0x26, 0xeb, 0x5a,
+	0x55, 0xb2, 0xb7, 0x94, 0xb7, 0x27, 0x26, 0x71, 0xfe, 0xab, 0x02, 0xf5, 0x18, 0x4d, 0xd6, 0x32,
+	0x66, 0xae, 0x35, 0x3f, 0xbd, 0x56, 0x98, 0x81, 0xaa, 0x17, 0x48, 0x5f, 0x87, 0xfe, 0x13, 0x37,
+	0x29, 0xc4, 0x3a, 0x60, 0x4a, 0x57, 0xef, 0xdb, 0xce, 0x08, 0xad, 0x2a, 0xf5, 0x71, 0x25, 0x76,
+	0xf3, 0xd6, 0x4d, 0x0a, 0xbd, 0x3d, 0x27, 0x26, 0x49, 0xec, 0x19, 0x34, 0x95, 0x0e, 0xa4, 0x3b,
+	0x88, 0x38, 0x35, 0xe2, 0xac, 0x26, 0x7f, 0x40, 0x91, 0x94, 0x96, 0x4d, 0x65, 0x9b, 0xd0, 0x38,
+	0xf2, 0x3c, 0x27, 0xe2, 0x2d, 0x10, 0x8f, 0xc5, 0xbc, 0xae, 0xe7, 0x39, 0x29, 0x2b, 0x4d, 0x63,
+	0xbb, 0xb0, 0xa2, 0xa4, 0x3b, 0x70, 0x70, 0xeb, 0xd8, 0x93, 0x3d, 0x8c, 0xb8, 0x75, 0xe2, 0xde,
+	0x49, 0xd6, 0xcc, 0xc4, 0x33, 0xbb, 0x63, 0x7b, 0x4e, 0x4c, 0x53, 0xd9, 0x7b, 0x58, 0x1e, 0x8e,
+	0x1c, 0x2d, 0xb3, 0x72, 0x26, 0xc9, 0xdd, 0x8e, 0xe5, 0x3e, 0xa4, 0xe1, 0xbc, 0xda, 0x14, 0xb1,
+	0x5b, 0x87, 0xda, 0x59, 0x38, 0xe0, 0xdf, 0x0c, 0x80, 0xb4, 0x5c, 0xcc, 0x82, 0x7a, 0x1f, 0xbf,
+	0xda, 0x23, 0x47, 0x53, 0xb7, 0x2a, 0x22, 0x99, 0x86, 0x3d, 0x1c, 0x4a, 0x97, 0x3a, 0x55, 0x11,
+	0xe1, 0x90, 0x10, 0x7b, 0x4c, 0x9d, 0x09, 0x11, 0x7b, 0xcc, 0x18, 0x54, 0x95, 0x46, 0x9f, 0xba,
+	0x51, 0x11, 0x34, 0x0e, 0xfb, 0xe8, 0x3b, 0x76, 0x0f, 0x8f, 0x3d, 0xa7, 0x8f, 0x01, 0x15, 0xbd,
+	0x21, 0xb2, 0x10, 0xff, 0x69, 0xc0, 0x62, 0xae, 0xfa, 0x45, 0x17, 0x8d, 0xd4, 0x45, 0x0b, 0xcc,
+	0x00, 0x4f, 0x47, 0x32, 0xc0, 0x3e, 0x59, 0x31, 0xc5, 0x64, 0x1e, 0xee, 0xf7, 0xa1, 0x74, 0x77,
+	0xd0, 0x1d, 0xe8, 0x63, 0x72, 0x55, 0x13, 0x29, 0x40, 0x51, 0x7b, 0x1c, 0x47, 0xab, 0x71, 0x34,
+	0x01, 0x2e, 0xe1, 0xf2, 0x01, 0x34, 0x33, 0xad, 0x2e, 0x5a, 0x34, 0x27, 0x16, 0xf9, 0x6b, 0xb8,
+	0x39, 0xa3, 0xaf, 0xec, 0x31, 0xd4, 0x3d, 0xda, 0xbb, 0xc9, 0xe9, 0x4e, 0x36, 0x6c, 0x98, 0xf4,
+	0x91, 0x22, 0x22, 0xc9, 0xe0, 0xaf, 0xe0, 0x46, 0x79, 0x43, 0xaf, 0x26, 0xf3, 0xc3, 0x00, 0x48,
+	0x71, 0xc6, 0xf3, 0x67, 0x80, 0xca, 0x5b, 0xdc, 0xed, 0xeb, 0x99, 0x83, 0x45, 0xfd, 0xce, 0x9d,
+	0xa2, 0x56, 0x78, 0x09, 0x38, 0xd8, 0xd3, 0xd8, 0xa7, 0x2a, 0x9b, 0x62, 0x32, 0x67, 0x1c, 0xfe,
+	0x8b, 0xcf, 0x70, 0x7a, 0x2c, 0x1b, 0x22, 0x87, 0x75, 0x4d, 0x58, 0x88, 0xbc, 0x6d, 0xfe, 0x9e,
+	0x87, 0xc5, 0xe8, 0xae, 0xda, 0xc3, 0xe0, 0x4c, 0xf6, 0x90, 0x7d, 0x81, 0xd5, 0xb2, 0x87, 0x86,
+	0xf1, 0xf8, 0x07, 0x2f, 0x78, 0xe3, 0x5a, 0xf7, 0x2f, 0xcc, 0x89, 0xef, 0xd9, 0x7d, 0x58, 0x99,
+	0x7a, 0x1e, 0xd8, 0xdd, 0x98, 0x39, 0xeb, 0x11, 0x6a, 0xb5, 0x67, 0x27, 0xc4, 0xba, 0x87, 0x70,
+	0xad, 0xe4, 0x7a, 0x67, 0xf7, 0x32, 0x8d, 0x29, 0x7f, 0x36, 0x5a, 0xfc, 0xa2, 0x94, 0x48, 0xbd,
+	0x5b, 0x3f, 0x88, 0x9e, 0xf9, 0xa3, 0x05, 0xfa, 0x3c, 0xfd, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf0,
+	0xf2, 0x38, 0x59, 0x13, 0x08, 0x00, 0x00,
 }
diff --git a/pkg/proto/v0/settings.proto b/pkg/proto/v0/settings.proto
index 1ae603965..cda31203b 100644
--- a/pkg/proto/v0/settings.proto
+++ b/pkg/proto/v0/settings.proto
@@ -90,4 +90,5 @@ message ListOption {
     int64 intValue = 2;
   }
   bool selected = 3;
+  string displayValue = 4;
 }
diff --git a/pkg/server/http/server.go b/pkg/server/http/server.go
index 13a830d5c..72d79b943 100644
--- a/pkg/server/http/server.go
+++ b/pkg/server/http/server.go
@@ -1,4 +1,4 @@
-// package http
+package http
 
 // import (
 // 	svc "github.com/owncloud/ocis-settings/pkg/service/v0"
diff --git a/pkg/store/filesystem/io.go b/pkg/store/filesystem/io.go
new file mode 100644
index 000000000..d3a8c9d7c
--- /dev/null
+++ b/pkg/store/filesystem/io.go
@@ -0,0 +1,42 @@
+package store
+
+import (
+	"github.com/golang/protobuf/jsonpb"
+	"github.com/golang/protobuf/proto"
+	"os"
+)
+
+// Unmarshal file into record
+func (s Store) parseRecordFromFile(record proto.Message, filePath string) error {
+	file, err := os.Open(filePath)
+	if err != nil {
+		s.Logger.Err(err).Msgf("error reading file %v: file not found", filePath)
+		return err
+	}
+	defer file.Close()
+
+	decoder := jsonpb.Unmarshaler{}
+	if err = decoder.Unmarshal(file, record); err != nil {
+		s.Logger.Err(err).Msgf("error reading file %v: unmarshalling failed", filePath)
+		return err
+	}
+	return nil
+}
+
+// Marshal record into file
+func (s Store) writeRecordToFile(record proto.Message, filePath string) error {
+	file, err := os.Create(filePath)
+	if err != nil {
+		s.Logger.Err(err).Msgf("error writing file %v: opening failed", filePath)
+		return err
+	}
+	defer file.Close()
+
+	encoder := jsonpb.Marshaler{}
+	if err = encoder.Marshal(file, record); err != nil {
+		s.Logger.Err(err).Msgf("error writing file %v: marshalling failed", filePath)
+		return err
+	}
+
+	return nil
+}
diff --git a/pkg/store/filesystem/paths.go b/pkg/store/filesystem/paths.go
new file mode 100644
index 000000000..8225c4e75
--- /dev/null
+++ b/pkg/store/filesystem/paths.go
@@ -0,0 +1,25 @@
+package store
+
+import (
+	"github.com/owncloud/ocis-settings/pkg/proto/v0"
+	"strings"
+)
+
+// Builds a unique file name from the given bundle
+func buildFileNameFromBundle(bundle *proto.SettingsBundle) string {
+	return buildFileNameFromBundleArgs(bundle.Extension, bundle.Key)
+}
+
+// Builds a unique file name from the given params
+func buildFileNameFromBundleArgs(extension string, key string) string {
+	return extension + "__" + key + ".json"
+}
+
+// Extracts extension and key from the given fileName and builds a (minimalistic) bundle from it
+func parseBundleFromFileName(fileName string) *proto.SettingsBundle {
+	parts := strings.Split(strings.Replace(fileName, ".json", "", 1), "__")
+	return &proto.SettingsBundle{
+		Key:       parts[1],
+		Extension: parts[0],
+	}
+}
diff --git a/pkg/store/filesystem/store.go b/pkg/store/filesystem/store.go
index 720abacc4..7bfa1ae06 100644
--- a/pkg/store/filesystem/store.go
+++ b/pkg/store/filesystem/store.go
@@ -6,9 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
-	"strings"
 
-	"github.com/golang/protobuf/jsonpb"
 	olog "github.com/owncloud/ocis-pkg/v2/log"
 	"github.com/owncloud/ocis-settings/pkg/config"
 	"github.com/owncloud/ocis-settings/pkg/proto/v0"
@@ -56,7 +54,7 @@ func (s Store) ListAll() ([]*proto.SettingsBundle, error) {
 
 	s.Logger.Info().Msg("listing bundles")
 	for _, v := range bundles {
-		records = append(records, parseFileName(v.Name()))
+		records = append(records, parseBundleFromFileName(v.Name()))
 	}
 
 	return records, nil
@@ -73,7 +71,7 @@ func (s Store) ListByExtension(extension string) ([]*proto.SettingsBundle, error
 
 	s.Logger.Info().Msgf("listing bundles by extension %v", extension)
 	for _, v := range bundles {
-		record := parseFileName(v.Name())
+		record := parseBundleFromFileName(v.Name())
 		if record.Extension == extension {
 			records = append(records, record)
 		}
@@ -84,73 +82,35 @@ func (s Store) ListByExtension(extension string) ([]*proto.SettingsBundle, error
 
 // Read tries to find a bundle by the given extension and key within the mountPath
 func (s Store) Read(extension string, key string) (*proto.SettingsBundle, error) {
-	fileName := buildFileNameFromData(extension, key)
-	contents, err := os.Open(path.Join(s.mountPath, fileName))
-	if err != nil {
-		s.Logger.Err(err).Msgf("error reading contents for extension %v and key %v: file not found", extension, key)
-		return nil, err
+	if len(extension) < 1 || len(key) < 1 {
+		s.Logger.Error().Msg("extension and key cannot be empty")
+		return nil, fmt.Errorf(emptyKeyError)
 	}
 
+	filePath := path.Join(s.mountPath, buildFileNameFromBundleArgs(extension, key))
 	record := proto.SettingsBundle{}
-	if err = jsonpb.Unmarshal(contents, &record); err != nil {
-		s.Logger.Err(err).Msg("error unmarshalling record")
+	if err := s.parseRecordFromFile(&record, filePath); err != nil {
 		return nil, err
 	}
 
+	s.Logger.Debug().Msgf("read contents from file: %v", filePath)
 	return &record, nil
 }
 
 // Write writes the given record into a file within the mountPath
-func (s Store) Write(rec *proto.SettingsBundle) (*proto.SettingsBundle, error) {
-	if len(rec.Key) < 1 {
-		s.Logger.Error().Msg("key cannot be empty")
+func (s Store) Write(record *proto.SettingsBundle) (*proto.SettingsBundle, error) {
+	if len(record.Extension) < 1 || len(record.Key) < 1 {
+		s.Logger.Error().Msg("extension and key cannot be empty")
 		return nil, fmt.Errorf(emptyKeyError)
 	}
 
-	marshaler := jsonpb.Marshaler{}
-	recordPath := path.Join(s.mountPath, buildFileNameFromBundle(rec))
-	if err := ioutil.WriteFile(recordPath, []byte{}, 0644); err != nil {
+	filePath := path.Join(s.mountPath, buildFileNameFromBundle(record))
+	if err := s.writeRecordToFile(record, filePath); err != nil {
 		return nil, err
 	}
 
-	fd, err := os.OpenFile(recordPath, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
-	if err != nil {
-		s.Logger.Err(err).
-			Str(
-				"finding file",
-				fmt.Sprintf("file `%v` not found on store: `%v`", recordPath, s.mountPath),
-			)
-	}
-
-	if err = marshaler.Marshal(fd, rec); err != nil {
-		s.Logger.Err(err).
-			Str(
-				"marshaling record",
-				fmt.Sprintf("error marshaling record: %+v", rec),
-			)
-	}
-
-	s.Logger.Info().Msgf("request contents written to file: %v", recordPath)
-	return rec, nil
-}
-
-// Builds a unique file name from the given bundle
-func buildFileNameFromBundle(bundle *proto.SettingsBundle) string {
-	return buildFileNameFromData(bundle.Extension, bundle.Key)
-}
-
-// Builds a unique file name from the given params
-func buildFileNameFromData(extension string, key string) string {
-	return extension + "__" + key + ".json"
-}
-
-// Extracts extension and key from the given fileName and builds a (minimalistic) bundle from it
-func parseFileName(fileName string) *proto.SettingsBundle {
-	parts := strings.Split(strings.Replace(fileName, ".json", "", 1), "__")
-	return &proto.SettingsBundle{
-		Key:       parts[1],
-		Extension: parts[0],
-	}
+	s.Logger.Debug().Msgf("request contents written to file: %v", filePath)
+	return record, nil
 }
 
 func init() {