Preperation for component manager update