Corrected serialization of primitives, annotations missing