Performance improvement to ComponentStore