Commercial components integration

@kenlim @kelvin-chappell @phamann Does this make sense?