Modify registries for ease of inclusion