[WIP][3.9] Move registry to configuration