Avoid deprecated methods