Added interface auto-matching