DATAES-40 added check for annotated field type to avoid unnecessary complex mapping