Data/Registry system reworked