Fixed class import issues