changed some messages from string based types to enum based types