Fixed external component imports