diff --git a/app/Lib/Data/DateData.php b/app/Lib/Data/DateData.php
index 5c86aeaa..db7c920d 100644
--- a/app/Lib/Data/DateData.php
+++ b/app/Lib/Data/DateData.php
@@ -8,18 +8,16 @@ use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Attributes\WithTransformer;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-use Spatie\TypeScriptTransformer\Attributes\Typescript;
 use App\Lib\Transformers\DateTransformer;
+use Carbon\Carbon;
 
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-#[TypeScript]
 class DateData extends Data
 {
-
     public function __construct(
         #[WithTransformer(DateTransformer::class)]
-        public string $raw,
+        public Carbon $raw,
         public string $human,
     ) {}
 
diff --git a/app/Member/Data/ActivityData.php b/app/Member/Data/ActivityData.php
index 51717a34..2e346d2c 100644
--- a/app/Member/Data/ActivityData.php
+++ b/app/Member/Data/ActivityData.php
@@ -6,11 +6,9 @@ use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-use Spatie\TypeScriptTransformer\Attributes\Typescript;
 
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-#[TypeScript]
 class ActivityData extends Data {
 
     public function __construct(
diff --git a/app/Member/Data/GroupData.php b/app/Member/Data/GroupData.php
index 84599e9c..892b665f 100644
--- a/app/Member/Data/GroupData.php
+++ b/app/Member/Data/GroupData.php
@@ -6,11 +6,9 @@ use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-use Spatie\TypeScriptTransformer\Attributes\Typescript;
 
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-#[TypeScript]
 class GroupData extends Data {
 
     public function __construct(
diff --git a/app/Member/Data/MembershipData.php b/app/Member/Data/MembershipData.php
index c1590f71..b29e5bff 100644
--- a/app/Member/Data/MembershipData.php
+++ b/app/Member/Data/MembershipData.php
@@ -10,11 +10,9 @@ use App\Member\Membership;
 use App\Member\Member;
 use App\Activity;
 use App\Lib\Data\DateData;
-use Spatie\TypeScriptTransformer\Attributes\Typescript;
 
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-#[TypeScript]
 class MembershipData extends Data
 {
 
diff --git a/app/Member/Data/SubactivityData.php b/app/Member/Data/SubactivityData.php
index fdea4742..e8dea078 100644
--- a/app/Member/Data/SubactivityData.php
+++ b/app/Member/Data/SubactivityData.php
@@ -6,11 +6,9 @@ use Spatie\LaravelData\Data;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Attributes\MapOutputName;
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
-use Spatie\TypeScriptTransformer\Attributes\Typescript;
 
 #[MapInputName(SnakeCaseMapper::class)]
 #[MapOutputName(SnakeCaseMapper::class)]
-#[TypeScript]
 class SubactivityData extends Data {
 
     public function __construct(