Refactor master bootstrapping
DHCP OMAPI snippets