Update components to align with ProvisionService