Resolved deprecation warnings