Undo int change and add field type enum for any messages

Undo int change and add field type enum for any messages #1661