Aggregates() and Registries() __init__() args have changed