Removed deprecation warnings from 2.11.0