component manager refractoring