Changed components to core