Use legacy compatible approach