Restored missing imports