Adding field_group to messages