Updated for method deprecation