Optimized registry