MVA: Updated deprecated implementation.