Updated import for backward compatibility in future