[API-66] Decouple serializers