More refactoring to component version