Corrected imports and exposed components