Fix: Use new-style interface variables