Fixed missing imports