Restore interfaces
Vendor-based import
Changed form example