BISERVER-7589: Annotations changes for serialization.