Corrected imports and docs