Renamed Delegates + OPMessage Class Change