modified message and field classes