Refactored calls to deprecated classes