accomodate new component class
Merge branch 'master' of https://github.com/ysui6888/indexing