Better updating of components.