CE-297 changing deprecated messages functions