Better handling of field descriptions