minor refactoring to componentRegistry