More work SubstrateManager