updated to remove deprecation warnings on SDK items