wip on service-structure updates