Refactor ComponentBuilder (introduced ForgeComponent class)