Some BasicComponents modularization