Modularize BaseComponentHolder