Optimized registry - Selector improvements