Reduce use of deprecated methods