diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
new file mode 100644
index 0000000..33b9de2
--- /dev/null
+++ b/CompatibilityMatrix.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "CompatibilityMatrix.h"
+
+namespace android {
+namespace vintf {
+
+constexpr Version CompatibilityMatrix::kVersion;
+
+bool CompatibilityMatrix::add(MatrixHal &&hal) {
+    return hals.emplace(hal.name, std::move(hal)).second;
+}
+
+bool CompatibilityMatrix::add(MatrixKernel &&kernel) {
+    kernels.push_back(std::move(kernel));
+    return true;
+}
+
+void CompatibilityMatrix::clear() {
+    hals.clear();
+    kernels.clear();
+}
+
+} // namespace vintf
+} // namespace android