Add workaround for deprecated methods