Changed details of implementation of component system