Refactor registry - major simplification.