Re-added missing imports