still need to support the distinction between registry and non-registry operation modes