Add helper classes that hold RegistryHandles