Refactor
Suppress deprecation warning here