Tried to replace all the messaging DBOs with the new annotation based method.  Could not replace ones with enums.