Additional deprecated events refactored.