Updated deprecation warnings