diff --git a/docs/design/images/macmanager_macrange.png b/docs/design/images/macmanager_macrange.png
new file mode 100644
index 000000000..e9a316697
Binary files /dev/null and b/docs/design/images/macmanager_macrange.png differ
diff --git a/docs/design/images/macmanager_macstate.png b/docs/design/images/macmanager_macstate.png
new file mode 100644
index 000000000..d44794318
Binary files /dev/null and b/docs/design/images/macmanager_macstate.png differ
diff --git a/docs/design/images/nodemanager_metadata_system.png b/docs/design/images/nodemanager_metadata_system.png
new file mode 100644
index 000000000..71f985766
Binary files /dev/null and b/docs/design/images/nodemanager_metadata_system.png differ
diff --git a/docs/design/images/services_macrange.png b/docs/design/images/services_macrange.png
deleted file mode 100644
index 50430fe9d..000000000
Binary files a/docs/design/images/services_macrange.png and /dev/null differ
diff --git a/docs/design/images/services_macstate.png b/docs/design/images/services_macstate.png
deleted file mode 100644
index 03450f604..000000000
Binary files a/docs/design/images/services_macstate.png and /dev/null differ
diff --git a/docs/design/mac_manager.adoc b/docs/design/mac_manager.adoc
index d754b1e69..dfc95d654 100644
Binary files a/docs/design/mac_manager.adoc and b/docs/design/mac_manager.adoc differ
diff --git a/docs/design/node_manager_metadata.adoc b/docs/design/node_manager_metadata.adoc
new file mode 100644
index 000000000..ab4e9153c
Binary files /dev/null and b/docs/design/node_manager_metadata.adoc differ