Adding in interface auto-detection