Fix for deprecated methods