diff --git a/build.gradle b/build.gradle
index 0e9c0c434..e22e3deb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,17 +82,23 @@ allprojects {
   }
 
   jacoco {
-    toolVersion = "0.8.10"
+    toolVersion = "0.8.11"
+  }
+
+  javadoc.options {
+    addStringOption('-release', '21')
   }
 
   compileJava {
     options.compilerArgs << '-Xlint:unchecked'
     options.compilerArgs << '-Xlint:rawtypes'
+    options.release = 21
   }
 
   compileTestJava {
     options.compilerArgs << '-Xlint:unchecked'
     options.compilerArgs << '-Xlint:rawtypes'
+    options.release = 21
   }
 
   jacocoTestReport {
@@ -107,8 +113,8 @@ allprojects {
 subprojects {
 
   java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
     
     withJavadocJar()
     withSourcesJar()
@@ -128,7 +134,7 @@ subprojects {
     if (it.getName().contains("Java21")) {
       it.options.release = 21
     } else {
-      it.options.release = 17
+      it.options.release = 21
     }
   }
 
diff --git a/core/build.gradle b/core/build.gradle
index 608269324..f5db065f9 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,30 +1,3 @@
-sourceSets {
-  java21 {
-    java {
-      srcDirs = ['src/main/java21']
-    }
-  }
-}
-
-java {
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
-  
-  withJavadocJar()
-  withSourcesJar()
-}
-
-compileJava21Java {
-  sourceCompatibility = JavaVersion.VERSION_21
-  targetCompatibility = JavaVersion.VERSION_21
-}
-
-jar {
-  into('META-INF/versions/21') {
-    from sourceSets.java21.output
-  }
-  manifest.attributes('Multi-Release': 'true')
-}
 
 dependencies {
   annotationProcessor projects.purefunProcessor
diff --git a/core/src/main/java/com/github/tonivade/purefun/concurrent/DefaultExecutor.java b/core/src/main/java/com/github/tonivade/purefun/concurrent/DefaultExecutor.java
deleted file mode 100644
index b1b78328d..000000000
--- a/core/src/main/java/com/github/tonivade/purefun/concurrent/DefaultExecutor.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2018-2023, Antonio Gabriel Muñoz Conejo <antoniogmc at gmail dot com>
- * Distributed under the terms of the MIT License
- */
-package com.github.tonivade.purefun.concurrent;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-final class DefaultExecutor {
-
-  static final Executor EXECUTOR = Executors.newCachedThreadPool();
-}
diff --git a/core/src/main/java/com/github/tonivade/purefun/concurrent/Future.java b/core/src/main/java/com/github/tonivade/purefun/concurrent/Future.java
index 6943e346e..0a0955b28 100644
--- a/core/src/main/java/com/github/tonivade/purefun/concurrent/Future.java
+++ b/core/src/main/java/com/github/tonivade/purefun/concurrent/Future.java
@@ -69,7 +69,7 @@
 @HigherKind
 public sealed interface Future<T> extends FutureOf<T>, Bindable<Future_, T> {
 
-  Executor DEFAULT_EXECUTOR = DefaultExecutor.EXECUTOR;
+  Executor DEFAULT_EXECUTOR = Executors.newVirtualThreadPerTaskExecutor();
 
   Try<T> await();
   Try<T> await(Duration timeout);
@@ -133,7 +133,7 @@ default Future<T> recover(Function1<? super Throwable, ? extends T> mapper) {
   <X extends Throwable> Future<T> recoverWith(Class<X> type, Function1<? super X, ? extends T> mapper);
 
   <U> Future<U> fold(
-      Function1<? super Throwable, ? extends U> failureMapper, 
+      Function1<? super Throwable, ? extends U> failureMapper,
       Function1<? super T, ? extends U> successMapper);
 
   default CompletableFuture<T> toCompletableFuture() {
@@ -233,41 +233,41 @@ static <T> Future<T> later(Executor executor, Producer<? extends T> producer) {
     return task(executor, producer::get);
   }
 
-  static <T extends AutoCloseable, R> Future<R> bracket(Future<? extends T> acquire, 
+  static <T extends AutoCloseable, R> Future<R> bracket(Future<? extends T> acquire,
       Function1<? super T, ? extends Future<? extends R>> use) {
     return bracket(DEFAULT_EXECUTOR, acquire, use);
   }
 
-  static <T extends AutoCloseable, R> Future<R> bracket(Executor executor, 
-      Future<? extends T> acquire, 
+  static <T extends AutoCloseable, R> Future<R> bracket(Executor executor,
+      Future<? extends T> acquire,
       Function1<? super T, ? extends Future<? extends R>> use) {
     return FutureImpl.bracket(executor, acquire, use, AutoCloseable::close);
   }
 
-  static <T, R> Future<R> bracket(Future<? extends T> acquire, 
-      Function1<? super T, ? extends Future<? extends R>> use, 
+  static <T, R> Future<R> bracket(Future<? extends T> acquire,
+      Function1<? super T, ? extends Future<? extends R>> use,
       Consumer1<? super T> release) {
     return bracket(DEFAULT_EXECUTOR, acquire, use, release);
   }
 
-  static <T, R> Future<R> bracket(Executor executor, 
-      Future<? extends T> acquire, 
-      Function1<? super T, ? extends Future<? extends R>> use, 
+  static <T, R> Future<R> bracket(Executor executor,
+      Future<? extends T> acquire,
+      Function1<? super T, ? extends Future<? extends R>> use,
       Consumer1<? super T> release) {
     return FutureImpl.bracket(executor, acquire, use, release);
   }
 
   // TODO
   static <A> Future<Sequence<A>> traverse(Sequence<Future<A>> sequence) {
-    return sequence.foldLeft(success(ImmutableList.empty()), 
+    return sequence.foldLeft(success(ImmutableList.empty()),
         (Future<Sequence<A>> xs, Future<A> a) -> map2(xs, a, Sequence::append));
   }
-  
-  static <T, V, R> Future<R> map2(Future<? extends T> fa, Future<? extends V> fb, 
+
+  static <T, V, R> Future<R> map2(Future<? extends T> fa, Future<? extends V> fb,
       Function2<? super T, ? super V, ? extends R> mapper) {
     return fb.ap(fa.map(mapper.curried()));
   }
-  
+
   static <T, V> Future<Tuple2<T, V>> tuple(Future<T> fa, Future<V> fb) {
     return map2(fa, fb, Tuple2::of);
   }
@@ -287,7 +287,7 @@ final class FutureImpl<T> implements Future<T> {
   private final Propagate propagate;
   private final Promise<T> promise;
   private final Cancellable cancellable;
-  
+
   private final UUID uuid;
 
   private FutureImpl(Executor executor, Callback<T> callback) {
@@ -345,7 +345,7 @@ public Try<T> await(Duration timeout) {
   public <R> Future<R> map(Function1<? super T, ? extends R> mapper) {
     return transform(value -> value.map(mapper));
   }
-  
+
   @Override
   public Future<T> mapError(Function1<? super Throwable, ? extends Throwable> mapper) {
     return transform(value -> value.mapError(mapper));
@@ -360,11 +360,11 @@ public <R> Future<R> flatMap(Function1<? super T, ? extends Kind<Future_, ? exte
   public <R> Future<R> andThen(Future<? extends R> next) {
     return flatMap(ignore -> next);
   }
-  
+
   @Override
   public <R> Future<R> ap(Future<Function1<? super T, ? extends R>> apply) {
     checkNonNull(apply);
-    return new FutureImpl<>(executor, 
+    return new FutureImpl<>(executor,
         (p, c) -> promise.onComplete(try1 -> apply.onComplete(
             try2 -> p.tryComplete(Try.map2(try2, try1, Function1::apply)))), this::cancel);
   }
@@ -406,7 +406,7 @@ public void cancel(boolean mayInterruptThread) {
   public Promise<T> toPromise() {
     return promise;
   }
-  
+
   @Override
   public String toString() {
     return "Future(" + uuid + ')';
@@ -447,7 +447,7 @@ static <T> Future<T> async(Executor executor,
       Consumer1<Consumer1<? super Try<? extends T>>> consumer) {
     checkNonNull(executor);
     checkNonNull(consumer);
-    return new FutureImpl<>(executor, 
+    return new FutureImpl<>(executor,
         (p, c) -> Future.later(executor, () -> {
           c.updateThread();
           return consumer.asFunction().apply(p::tryComplete);
@@ -494,7 +494,7 @@ static Executor delayedExecutor(Duration delay, Executor executor) {
 }
 
 interface Callback<T> {
-  
+
   void accept(Promise<T> promise, Cancellable cancellable);
 }
 
diff --git a/core/src/main/java/com/github/tonivade/purefun/data/Range.java b/core/src/main/java/com/github/tonivade/purefun/data/Range.java
index 305869953..47b2cfc43 100644
--- a/core/src/main/java/com/github/tonivade/purefun/data/Range.java
+++ b/core/src/main/java/com/github/tonivade/purefun/data/Range.java
@@ -4,45 +4,25 @@
  */
 package com.github.tonivade.purefun.data;
 
-import com.github.tonivade.purefun.Equal;
 import com.github.tonivade.purefun.Function1;
 import com.github.tonivade.purefun.Tuple;
 
-import java.io.Serial;
-import java.io.Serializable;
 import java.util.Iterator;
-import java.util.Objects;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import static com.github.tonivade.purefun.Function1.identity;
+import static com.github.tonivade.purefun.Precondition.check;
+import static com.github.tonivade.purefun.Precondition.greaterThanOrEquals;
 import static com.github.tonivade.purefun.type.Validation.mapN;
 import static com.github.tonivade.purefun.type.Validation.requireGreaterThanOrEqual;
 import static com.github.tonivade.purefun.type.Validation.requireLowerThan;
 import static com.github.tonivade.purefun.type.Validation.requireLowerThanOrEqual;
 
-public final class Range implements Iterable<Integer>, Serializable {
+public record Range(int begin, int end) implements Iterable<Integer> {
 
-  @Serial
-  private static final long serialVersionUID = 7923835507243835436L;
-
-  private static final Equal<Range> EQUAL = 
-      Equal.<Range>of().comparing(x -> x.begin).comparing(x -> x.end);
-
-  private final int begin;
-  private final int end;
-
-  private Range(int begin, int end) {
-    this.begin = begin;
-    this.end = end;
-  }
-
-  public int begin() {
-    return begin;
-  }
-
-  public int end() {
-    return end;
+  public Range {
+    check(greaterThanOrEquals(end, begin));
   }
 
   public boolean contains(int value) {
@@ -76,16 +56,6 @@ public Iterator<Integer> iterator() {
     return intStream().iterator();
   }
 
-  @Override
-  public boolean equals(Object obj) {
-    return EQUAL.applyTo(this, obj);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(begin, end);
-  }
-
   @Override
   public String toString() {
     return String.format("Range(%d..%d)", begin, end);
diff --git a/core/src/main/java/com/github/tonivade/purefun/type/Const.java b/core/src/main/java/com/github/tonivade/purefun/type/Const.java
index 4fe994183..a8050bd01 100644
--- a/core/src/main/java/com/github/tonivade/purefun/type/Const.java
+++ b/core/src/main/java/com/github/tonivade/purefun/type/Const.java
@@ -6,28 +6,13 @@
 
 import static com.github.tonivade.purefun.Precondition.checkNonNull;
 
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Objects;
-import com.github.tonivade.purefun.Equal;
 import com.github.tonivade.purefun.HigherKind;
 
 @HigherKind
-public final class Const<T, A> implements ConstOf<T, A>, Serializable {
+public record Const<T, A>(T value) implements ConstOf<T, A> {
 
-  @Serial
-  private static final long serialVersionUID = 7431389527943145565L;
-
-  private static final Equal<Const<?, ?>> EQUAL = Equal.<Const<?, ?>>of().comparing(Const::get);
-
-  private final T value;
-
-  private Const(T value) {
-    this.value = checkNonNull(value);
-  }
-
-  public T get() {
-    return value;
+  public Const {
+    checkNonNull(value);
   }
 
   @SuppressWarnings("unchecked")
@@ -35,16 +20,6 @@ public <B> Const<T, B> retag() {
     return (Const<T, B>) this;
   }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(value);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return EQUAL.applyTo(this, obj);
-  }
-
   @Override
   public String toString() {
     return "Const(" + value + ")";
diff --git a/core/src/main/java/com/github/tonivade/purefun/type/Either.java b/core/src/main/java/com/github/tonivade/purefun/type/Either.java
index d099b4b93..53e0d0352 100644
--- a/core/src/main/java/com/github/tonivade/purefun/type/Either.java
+++ b/core/src/main/java/com/github/tonivade/purefun/type/Either.java
@@ -8,13 +8,9 @@
 import static com.github.tonivade.purefun.Function1.identity;
 import static com.github.tonivade.purefun.Precondition.checkNonNull;
 
-import java.io.Serial;
-import java.io.Serializable;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.stream.Stream;
 
-import com.github.tonivade.purefun.Equal;
 import com.github.tonivade.purefun.Function1;
 import com.github.tonivade.purefun.Function2;
 import com.github.tonivade.purefun.HigherKind;
@@ -51,12 +47,14 @@ static <L, R> Either<L, R> right(R value) {
 
   boolean isLeft();
   boolean isRight();
+
   /**
    * Returns the left value if available. If not, it throws {@code NoSuchElementException}
    * @return the left value
    * @throws NoSuchElementException if left value is not available
    */
   L getLeft();
+
   /**
    * Returns the right value if available. If not, it throws {@code NoSuchElementException}
    * @return the right value
@@ -65,38 +63,38 @@ static <L, R> Either<L, R> right(R value) {
   R getRight();
 
   default R get() {
-    if (isRight()) {
-      return getRight();
+    if (this instanceof Right<L, R>(var right)) {
+      return right;
     }
     throw new NoSuchElementException("get() on left");
   }
 
   default Option<L> left() {
-    if (isLeft()) {
-      return Option.some(getLeft());
+    if (this instanceof Left<L, R>(var left)) {
+      return Option.some(left);
     }
     return Option.none();
   }
 
   default Option<R> right() {
-    if (isRight()) {
-      return Option.some(getRight());
+    if (this instanceof Right<L, R>(var right)) {
+      return Option.some(right);
     }
     return Option.none();
   }
 
   default Either<R, L> swap() {
-    if (isRight()) {
-      return left(getRight());
-    }
-    return right(getLeft());
+    return switch (this) {
+      case Right<L, R>(var right) -> left(right);
+      case Left<L, R>(var left) -> right(left);
+    };
   }
 
   default <T, U> Either<T, U> bimap(Function1<? super L, ? extends T> leftMapper, Function1<? super R, ? extends U> rightMapper) {
-    if (isRight()) {
-      return right(rightMapper.apply(getRight()));
-    }
-    return left(leftMapper.apply(getLeft()));
+    return switch (this) {
+      case Right<L, R>(var right) -> right(rightMapper.apply(right));
+      case Left<L, R>(var left) -> left(leftMapper.apply(left));
+    };
   }
 
   @Override
@@ -111,22 +109,22 @@ default <T> Either<T, R> mapLeft(Function1<? super L, ? extends T> map) {
   @Override
   @SuppressWarnings("unchecked")
   default <T> Either<L, T> flatMap(Function1<? super R, ? extends Kind<Kind<Either_, L>, ? extends T>> map) {
-    if (isRight()) {
-      return map.andThen(EitherOf::<L, T>narrowK).apply(getRight());
+    if (this instanceof Right<L, R>(var right)) {
+      return map.andThen(EitherOf::<L, T>narrowK).apply(right);
     }
     return (Either<L, T>) this;
   }
 
   @SuppressWarnings("unchecked")
   default <T> Either<T, R> flatMapLeft(Function1<? super L, ? extends Either<? extends T, R>> map) {
-    if (isLeft()) {
-      return (Either<T, R>) map.apply(getLeft());
+    if (this instanceof Left<L, R>(var left)) {
+      return (Either<T, R>) map.apply(left);
     }
     return (Either<T, R>) this;
   }
 
   default Option<Either<L, R>> filter(Matcher1<? super R> matcher) {
-    if (isRight() && matcher.match(getRight())) {
+    if (this instanceof Right<L, R>(var right) && matcher.match(right)) {
       return Option.some(this);
     }
     return Option.none();
@@ -137,14 +135,17 @@ default Option<Either<L, R>> filterNot(Matcher1<? super R> matcher) {
   }
 
   default Either<L, R> filterOrElse(Matcher1<? super R> matcher, Producer<? extends Kind<Kind<Either_, L>, R>> orElse) {
-    if (isLeft() || matcher.match(getRight())) {
+    if (this instanceof Left) {
+      return this;
+    }
+    if (this instanceof Right<L, R>(var right) && matcher.match(right)) {
       return this;
     }
     return orElse.andThen(EitherOf::narrowK).get();
   }
 
   default Either<L, R> or(Producer<Kind<Kind<Either_, L>, R>> orElse) {
-    if (isLeft()) {
+    if (this instanceof Left) {
       return orElse.andThen(EitherOf::narrowK).get();
     }
     return this;
@@ -167,10 +168,10 @@ default R getOrElse(Producer<? extends R> orElse) {
   }
 
   default <T> T fold(Function1<? super L, ? extends T> leftMapper, Function1<? super R, ? extends T> rightMapper) {
-    if (isRight()) {
-      return rightMapper.apply(getRight());
-    }
-    return leftMapper.apply(getLeft());
+    return switch (this) {
+      case Right<L, R>(var right) -> rightMapper.apply(right);
+      case Left<L, R>(var left) -> leftMapper.apply(left);
+    };
   }
 
   default Stream<R> stream() {
@@ -188,28 +189,21 @@ default Option<R> toOption() {
   default Validation<L, R> toValidation() {
     return fold(Validation::invalid, Validation::valid);
   }
-  
+
   static <A> A merge(Either<A, A> either) {
     return either.fold(identity(), identity());
   }
 
   static <L, A, B, Z> Either<L, Z> map2(
-      Either<L, ? extends A> eitherA, Either<L, ? extends B> eitherB, 
+      Either<L, ? extends A> eitherA, Either<L, ? extends B> eitherB,
       Function2<? super A, ? super B, ? extends Z> mapper) {
     return eitherA.flatMap(a -> eitherB.map(b -> mapper.apply(a, b)));
   }
 
-  final class Left<L, R> implements Either<L, R>, Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 7040154642166638129L;
-
-    private static final Equal<Left<?, ?>> EQUAL = Equal.<Left<?, ?>>of().comparing(Left::getLeft);
+  record Left<L, R>(L value) implements Either<L, R> {
 
-    private final L value;
-
-    private Left(L value) {
-      this.value = checkNonNull(value);
+    public Left {
+      checkNonNull(value);
     }
 
     @Override
@@ -232,33 +226,16 @@ public R getRight() {
       throw new NoSuchElementException("getRight() in left");
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(value);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return EQUAL.applyTo(this, obj);
-    }
-
     @Override
     public String toString() {
       return "Left(" + value + ")";
     }
   }
 
-  final class Right<L, R> implements Either<L, R>, Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 164989996450592091L;
-
-    private static final Equal<Right<?, ?>> EQUAL = Equal.<Right<?, ?>>of().comparing(Right::getRight);
-
-    private final R value;
+  record Right<L, R>(R value) implements Either<L, R> {
 
-    private Right(R value) {
-      this.value = checkNonNull(value);
+    public Right {
+      checkNonNull(value);
     }
 
     @Override
@@ -281,16 +258,6 @@ public R getRight() {
       return value;
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(value);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return EQUAL.applyTo(this, obj);
-    }
-
     @Override
     public String toString() {
       return "Right(" + value + ")";
diff --git a/core/src/main/java/com/github/tonivade/purefun/type/Id.java b/core/src/main/java/com/github/tonivade/purefun/type/Id.java
index ab552ca6b..b1be04da3 100644
--- a/core/src/main/java/com/github/tonivade/purefun/type/Id.java
+++ b/core/src/main/java/com/github/tonivade/purefun/type/Id.java
@@ -6,11 +6,6 @@
 
 import static com.github.tonivade.purefun.Precondition.checkNonNull;
 
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Objects;
-
-import com.github.tonivade.purefun.Equal;
 import com.github.tonivade.purefun.Function1;
 import com.github.tonivade.purefun.HigherKind;
 import com.github.tonivade.purefun.Kind;
@@ -23,17 +18,10 @@
  * @param <T> the wrapped value
  */
 @HigherKind
-public final class Id<T> implements IdOf<T>, Bindable<Id_, T>, Serializable {
-
-  @Serial
-  private static final long serialVersionUID = -6295106408421985189L;
-
-  private static final Equal<Id<?>> EQUAL = Equal.<Id<?>>of().comparing(Id::get);
+public record Id<T>(T value) implements IdOf<T>, Bindable<Id_, T> {
 
-  private final T value;
-
-  private Id(T value) {
-    this.value = checkNonNull(value);
+  public Id {
+    checkNonNull(value);
   }
 
   @Override
@@ -46,20 +34,6 @@ public <R> Id<R> flatMap(Function1<? super T, ? extends Kind<Id_, ? extends R>>
     return map.andThen(IdOf::<R>narrowK).apply(value);
   }
 
-  public T get() {
-    return value;
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(value);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return EQUAL.applyTo(this, obj);
-  }
-
   @Override
   public String toString() {
     return "Id(" + value + ")";
diff --git a/core/src/main/java/com/github/tonivade/purefun/type/Option.java b/core/src/main/java/com/github/tonivade/purefun/type/Option.java
index 0eedded29..1b0b93845 100644
--- a/core/src/main/java/com/github/tonivade/purefun/type/Option.java
+++ b/core/src/main/java/com/github/tonivade/purefun/type/Option.java
@@ -9,21 +9,19 @@
 import static com.github.tonivade.purefun.Producer.cons;
 import static java.util.Objects.nonNull;
 
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
 
 import com.github.tonivade.purefun.Consumer1;
-import com.github.tonivade.purefun.Equal;
 import com.github.tonivade.purefun.Function1;
 import com.github.tonivade.purefun.Function2;
 import com.github.tonivade.purefun.HigherKind;
 import com.github.tonivade.purefun.Kind;
 import com.github.tonivade.purefun.Bindable;
 import com.github.tonivade.purefun.Matcher1;
+import com.github.tonivade.purefun.Nothing;
 import com.github.tonivade.purefun.Producer;
 import com.github.tonivade.purefun.data.Sequence;
 
@@ -70,36 +68,36 @@ static <A, B, Z> Option<Z> map2(Option<A> optionA, Option<B> optionB, Function2<
 
   @Override
   default <R> Option<R> map(Function1<? super T, ? extends R> mapper) {
-    if (this instanceof Some<T> s) {
-      return some(mapper.apply(s.value));
-    }
-    return none();
+    return switch (this) {
+      case Some<T>(var value) -> some(mapper.apply(value));
+      case None n -> none();
+    };
   }
 
   @Override
   default <R> Option<R> flatMap(Function1<? super T, ? extends Kind<Option_, ? extends R>> map) {
-    if (this instanceof Some<T> s) {
-      return map.andThen(OptionOf::<R>narrowK).apply(s.value);
-    }
-    return none();
+    return switch (this) {
+      case Some<T>(var value) -> map.andThen(OptionOf::<R>narrowK).apply(value);
+      case None n -> none();
+    };
   }
 
   default Option<T> ifPresent(Consumer1<? super T> consumer) {
-    if (this instanceof Some<T> s) {
-      consumer.accept(s.value);
+    if (this instanceof Some<T>(var value)) {
+      consumer.accept(value);
     }
     return this;
   }
 
   default Option<T> ifEmpty(Runnable run) {
-    if (this instanceof None<T>) {
+    if (this instanceof None) {
       run.run();
     }
     return this;
   }
 
   default Option<T> filter(Matcher1<? super T> matcher) {
-    if (this instanceof Some<T> s && matcher.match(s.value)) {
+    if (this instanceof Some<T>(var value) && matcher.match(value)) {
       return this;
     }
     return none();
@@ -115,7 +113,7 @@ default Option<T> or(Producer<Kind<Option_, T>> orElse) {
     }
     return this;
   }
-  
+
   default Option<T> orElse(Kind<Option_, T> orElse) {
     return or(cons(orElse));
   }
@@ -133,24 +131,21 @@ default T getOrElse(Producer<? extends T> producer) {
   }
 
   default T getOrElseThrow() {
-    if (this instanceof Some<T> s) {
-      return s.value;
-    }
-    throw new NoSuchElementException();
+    return getOrElseThrow(NoSuchElementException::new);
   }
 
   default <X extends Throwable> T getOrElseThrow(Producer<? extends X> producer) throws X {
-    if (this instanceof Some<T> s) {
-      return s.value;
+    if (this instanceof Some<T>(var value)) {
+      return value;
     }
     throw producer.get();
   }
 
   default <U> U fold(Producer<? extends U> orElse, Function1<? super T, ? extends U> mapper) {
-    if (this instanceof Some<T> s) {
-      return mapper.apply(s.value);
-    }
-    return orElse.get();
+    return switch (this) {
+      case Some<T>(var value) -> mapper.apply(value);
+      case None n -> orElse.get();
+    };
   }
 
   default Stream<T> stream() {
@@ -173,17 +168,10 @@ default Try<T> toTry() {
     return Try.fromEither(toEither());
   }
 
-  final class Some<T> implements Option<T>, Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 7757183287962895363L;
-
-    private static final Equal<Some<?>> EQUAL = Equal.<Some<?>>of().comparing(s -> s.value);
-
-    private final T value;
+  record Some<T>(T value) implements Option<T>, Serializable {
 
-    private Some(T value) {
-      this.value = checkNonNull(value);
+    public Some {
+      checkNonNull(value);
     }
 
     @Override
@@ -196,30 +184,14 @@ public boolean isPresent() {
       return true;
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(value);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return EQUAL.applyTo(this, obj);
-    }
-
     @Override
     public String toString() {
       return "Some(" + value + ")";
     }
   }
 
-  final class None<T> implements Option<T>, Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 7202112931010040785L;
-
-    private static final None<?> INSTANCE = new None<>();
-
-    private None() { }
+  enum None implements Option<Nothing> {
+    INSTANCE;
 
     @Override
     public boolean isEmpty() {
@@ -231,24 +203,9 @@ public boolean isPresent() {
       return false;
     }
 
-    @Override
-    public int hashCode() {
-      return 1;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return this == obj;
-    }
-
     @Override
     public String toString() {
       return "None";
     }
-    
-    @Serial
-    private Object readResolve() {
-      return INSTANCE;
-    }
   }
 }
diff --git a/core/src/main/java/com/github/tonivade/purefun/type/Try.java b/core/src/main/java/com/github/tonivade/purefun/type/Try.java
index fa96a0967..e3039be65 100644
--- a/core/src/main/java/com/github/tonivade/purefun/type/Try.java
+++ b/core/src/main/java/com/github/tonivade/purefun/type/Try.java
@@ -8,8 +8,6 @@
 import static com.github.tonivade.purefun.Function1.identity;
 import static com.github.tonivade.purefun.Precondition.checkNonNull;
 
-import java.io.Serial;
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.NoSuchElementException;
 import java.util.Objects;
@@ -23,6 +21,7 @@
 import com.github.tonivade.purefun.Kind;
 import com.github.tonivade.purefun.Bindable;
 import com.github.tonivade.purefun.Matcher1;
+import com.github.tonivade.purefun.Nothing;
 import com.github.tonivade.purefun.Producer;
 import com.github.tonivade.purefun.Recoverable;
 import com.github.tonivade.purefun.data.ImmutableList;
@@ -53,8 +52,9 @@ static <T> Try<T> failure() {
     return failure(new RuntimeException());
   }
 
+  @SuppressWarnings("unchecked")
   static <T> Try<T> failure(Throwable error) {
-    return new Failure<>(error);
+    return (Try<T>) new Failure(error);
   }
 
   static <T> Try<T> noSuchElementException() {
@@ -120,48 +120,46 @@ default <R> Try<R> map(Function1<? super T, ? extends R> mapper) {
   }
 
   default Try<T> mapError(Function1<? super Throwable, ? extends Throwable> mapper) {
-    if (this instanceof Failure<T> f) {
-      return failure(mapper.apply(f.cause));
-    }
-    return this;
+    return switch (this) {
+      case Failure(var cause) -> failure(mapper.apply(cause));
+      case Success<T> s -> this;
+    };
   }
 
   @Override
   @SuppressWarnings("unchecked")
   default <R> Try<R> flatMap(Function1<? super T, ? extends Kind<Try_, ? extends R>> mapper) {
-    if (this instanceof Success<T> s) {
-      return mapper.andThen(TryOf::<R>narrowK).apply(s.value);
-    }
-    return (Try<R>) this;
+    return switch (this) {
+      case Success<T>(var value) -> mapper.andThen(TryOf::<R>narrowK).apply(value);
+      case Failure f -> (Try<R>) this;
+    };
   }
 
   default Try<T> onFailure(Consumer1<? super Throwable> consumer) {
-    if (this instanceof Failure<T> f) {
-      consumer.accept(f.cause);
+    if (this instanceof Failure(var cause)) {
+      consumer.accept(cause);
     }
     return this;
   }
 
   default Try<T> onSuccess(Consumer1<? super T> consumer) {
-    if (this instanceof Success<T> s) {
-      consumer.accept(s.value);
+    if (this instanceof Success<T>(var value)) {
+      consumer.accept(value);
     }
     return this;
   }
 
   default Try<T> recover(Function1<? super Throwable, ? extends T> mapper) {
-    if (this instanceof Failure<T> f) {
-      return Try.of(() -> mapper.apply(f.cause));
+    if (this instanceof Failure(var cause)) {
+      return Try.of(() -> mapper.apply(cause));
     }
     return this;
   }
 
   @SuppressWarnings("unchecked")
   default <X extends Throwable> Try<T> recoverWith(Class<X> type, Function1<? super X, ? extends T> mapper) {
-    if (this instanceof Failure<T> f) {
-      if (type.isAssignableFrom(f.cause.getClass())) {
-        return Try.of(() -> mapper.apply((X) getCause()));
-      }
+    if (this instanceof Failure(var cause) && type.isAssignableFrom(cause.getClass())) {
+      return Try.of(() -> mapper.apply((X) cause));
     }
     return this;
   }
@@ -175,17 +173,20 @@ default Try<T> filterNot(Matcher1<? super T> matcher) {
   }
 
   default Try<T> filterOrElse(Matcher1<? super T> matcher, Producer<? extends Kind<Try_, ? extends T>> producer) {
-    if (this instanceof Failure || (this instanceof Success<T> s && matcher.match(s.value))) {
+    if (this instanceof Failure) {
+      return this;
+    }
+    if (this instanceof Success<T>(var value) && matcher.match(value)) {
       return this;
     }
     return producer.andThen(TryOf::<T>narrowK).get();
   }
 
   default <U> U fold(Function1<? super Throwable, ? extends U> failureMapper, Function1<? super T, ? extends U> successMapper) {
-    if (this instanceof Success<T> s) {
-      return successMapper.apply(s.value);
-    }
-    return failureMapper.apply(getCause());
+    return switch (this) {
+      case Success<T>(var value) -> successMapper.apply(value);
+      case Failure(var cause) -> failureMapper.apply(cause);
+    };
   }
 
   default Try<T> or(Producer<Kind<Try_, T>> orElse) {
@@ -212,8 +213,8 @@ default T getOrElse(Producer<? extends T> producer) {
   }
 
   default <X extends Throwable> T getOrElseThrow(Producer<? extends X> producer) throws X {
-    if (this instanceof Success<T> s) {
-      return s.value;
+    if (this instanceof Success<T>(var value)) {
+      return value;
     }
     throw producer.get();
   }
@@ -238,17 +239,10 @@ default <E> Validation<E, T> toValidation(Function1<? super Throwable, ? extends
     return fold(map.andThen(Validation::invalid), Validation::valid);
   }
 
-  final class Success<T> implements Try<T>, Serializable {
-
-    @Serial
-    private static final long serialVersionUID = -3934628369477099278L;
-
-    private static final Equal<Success<?>> EQUAL = Equal.<Success<?>>of().comparing(s -> s.value);
-
-    private final T value;
+  record Success<T>(T value) implements Try<T> {
 
-    private Success(T value) {
-      this.value = checkNonNull(value);
+    public Success {
+      checkNonNull(value);
     }
 
     @Override
@@ -271,34 +265,19 @@ public Throwable getCause() {
       throw new NoSuchElementException("success doesn't have any cause");
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(value);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return EQUAL.applyTo(this, obj);
-    }
-
     @Override
     public String toString() {
       return "Success(" + value + ")";
     }
   }
 
-  final class Failure<T> implements Try<T>, Serializable, Recoverable {
+  record Failure(Throwable cause) implements Try<Nothing>, Recoverable {
 
-    @Serial
-    private static final long serialVersionUID = -8155444386075553318L;
+    private static final Equal<Failure> EQUAL =
+        Equal.<Failure>of().comparing(Failure::getMessage).comparingArray(Failure::getStackTrace);
 
-    private static final Equal<Failure<?>> EQUAL =
-        Equal.<Failure<?>>of().comparing(Failure::getMessage).comparingArray(Failure::getStackTrace);
-
-    private final Throwable cause;
-
-    private Failure(Throwable cause) {
-      this.cause = checkNonNull(cause);
+    public Failure {
+      checkNonNull(cause);
     }
 
     @Override
@@ -312,7 +291,7 @@ public boolean isSuccess() {
     }
 
     @Override
-    public T getOrElseThrow() {
+    public Nothing getOrElseThrow() {
       return sneakyThrow(cause);
     }
 
diff --git a/core/src/main/java/com/github/tonivade/purefun/type/Validation.java b/core/src/main/java/com/github/tonivade/purefun/type/Validation.java
index eb84a776d..e311b9016 100644
--- a/core/src/main/java/com/github/tonivade/purefun/type/Validation.java
+++ b/core/src/main/java/com/github/tonivade/purefun/type/Validation.java
@@ -83,20 +83,20 @@ static <E, T> Validation<Result<E>, T> invalidOf(E error, E... errors) {
   @Override
   @SuppressWarnings("unchecked")
   default <R> Validation<E, R> map(Function1<? super T, ? extends R> mapper) {
-    if (this instanceof Valid<E, T> v) {
-      return valid(mapper.apply(v.value));
+    if (this instanceof Valid<E, T>(var value)) {
+      return valid(mapper.apply(value));
     }
     return (Validation<E, R>) this;
   }
 
   @SuppressWarnings("unchecked")
   default <U> Validation<U, T> mapError(Function1<? super E, ? extends U> mapper) {
-    if (this instanceof Invalid<E, T> v) {
-      return invalid(mapper.apply(v.error));
+    if (this instanceof Invalid<E, T>(var error)) {
+      return invalid(mapper.apply(error));
     }
     return (Validation<U, T>) this;
   }
-  
+
   default <U, R>  Validation<U, R> bimap(Function1<? super E, ? extends U> error, Function1<? super T, ? extends R> mapper) {
     Validation<U, T> mapError = mapError(error);
     return mapError.map(mapper);
@@ -105,14 +105,17 @@ default <U, R>  Validation<U, R> bimap(Function1<? super E, ? extends U> error,
   @Override
   @SuppressWarnings("unchecked")
   default <R> Validation<E, R> flatMap(Function1<? super T, ? extends Kind<Kind<Validation_, E>, ? extends R>> mapper) {
-    if (this instanceof Valid<E, T> v) {
-      return mapper.andThen(ValidationOf::<E, R>narrowK).apply(v.value);
+    if (this instanceof Valid<E, T>(var value)) {
+      return mapper.andThen(ValidationOf::<E, R>narrowK).apply(value);
     }
     return (Validation<E, R>) this;
   }
 
   default Option<Validation<E, T>> filter(Matcher1<? super T> matcher) {
-    if (this instanceof Invalid || (this instanceof Valid<E, T> v && matcher.match(v.value))) {
+    if (this instanceof Invalid) {
+      return Option.some(this);
+    }
+    if (this instanceof Valid<E, T>(var value) && matcher.match(value)) {
       return Option.some(this);
     }
     return Option.none();
@@ -123,7 +126,10 @@ default Option<Validation<E, T>> filterNot(Matcher1<? super T> matcher) {
   }
 
   default Validation<E, T> filterOrElse(Matcher1<? super T> matcher, Producer<? extends Kind<Kind<Validation_, E>, T>> orElse) {
-    if (this instanceof Invalid || (this instanceof Valid<E, T> v && matcher.match(v.value))) {
+    if (this instanceof Invalid) {
+      return this;
+    }
+    if (this instanceof Valid<E, T>(var value) && matcher.match(value)) {
       return this;
     }
     return orElse.andThen(ValidationOf::narrowK).get();
@@ -157,18 +163,18 @@ default T getOrElseThrow() {
   }
 
   default <X extends Throwable> T getOrElseThrow(Function1<? super E, ? extends X> mapper) throws X {
-    if (this instanceof Valid<E, T> v) {
-      return v.value;
+    if (this instanceof Valid<E, T>(var value)) {
+      return value;
     }
     throw mapper.apply(getError());
   }
 
   default <U> U fold(Function1<? super E, ? extends U> invalidMap, Function1<? super T, ? extends U> validMap) {
-    if (this instanceof Valid<E, T> v) {
-      return validMap.apply(v.value);
+    if (this instanceof Valid<E, T>(var value)) {
+      return validMap.apply(value);
     }
-    if (this instanceof Invalid<E, T> i) {
-      return invalidMap.apply(i.error);
+    if (this instanceof Invalid<E, T>(var error)) {
+      return invalidMap.apply(error);
     }
     throw new UnsupportedOperationException();
   }
@@ -256,17 +262,10 @@ static Validation<String, Integer> requireLowerThanOrEqual(Integer value, int x)
     return nonNullAnd(lowerThanOrEqual(x, () -> "require " + value + " <= " + x)).validate(value);
   }
 
-  final class Valid<E, T> implements Validation<E, T>, Serializable {
+  record Valid<E, T>(T value) implements Validation<E, T> {
 
-    @Serial
-    private static final long serialVersionUID = -4276395187736455243L;
-
-    private static final Equal<Valid<?, ?>> EQUAL = Equal.<Valid<?, ?>>of().comparing(Valid::get);
-
-    private final T value;
-
-    private Valid(T value) {
-      this.value = checkNonNull(value);
+    public Valid {
+      checkNonNull(value);
     }
 
     @Override
@@ -289,33 +288,16 @@ public E getError() {
       throw new NoSuchElementException("valid value");
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(value);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return EQUAL.applyTo(this, obj);
-    }
-
     @Override
     public String toString() {
       return "Valid(" + value + ")";
     }
   }
 
-  final class Invalid<E, T> implements Validation<E, T>, Serializable {
+  record Invalid<E, T>(E error) implements Validation<E, T> {
 
-    @Serial
-    private static final long serialVersionUID = -5116403366555721062L;
-
-    private static final Equal<Invalid<?, ?>> EQUAL = Equal.<Invalid<?, ?>>of().comparing(Invalid::getError);
-
-    private final E error;
-
-    private Invalid(E error) {
-      this.error = Objects.requireNonNull(error);
+    public Invalid {
+      checkNonNull(error);
     }
 
     @Override
@@ -338,16 +320,6 @@ public E getError() {
       return error;
     }
 
-    @Override
-    public int hashCode() {
-      return Objects.hash(error);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-      return EQUAL.applyTo(this, obj);
-    }
-
     @Override
     public String toString() {
       return "Invalid(" + error + ")";
diff --git a/core/src/main/java21/com/github/tonivade/purefun/concurrent/DefaultExecutor.java b/core/src/main/java21/com/github/tonivade/purefun/concurrent/DefaultExecutor.java
deleted file mode 100644
index 0fd594893..000000000
--- a/core/src/main/java21/com/github/tonivade/purefun/concurrent/DefaultExecutor.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 2018-2023, Antonio Gabriel Muñoz Conejo <antoniogmc at gmail dot com>
- * Distributed under the terms of the MIT License
- */
-package com.github.tonivade.purefun.concurrent;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-
-final class DefaultExecutor {
-
-  static final Executor EXECUTOR = Executors.newVirtualThreadPerTaskExecutor();
-}
diff --git a/core/src/test/java/com/github/tonivade/purefun/concurrent/FutureTest.java b/core/src/test/java/com/github/tonivade/purefun/concurrent/FutureTest.java
index 149d36d94..3211da21f 100644
--- a/core/src/test/java/com/github/tonivade/purefun/concurrent/FutureTest.java
+++ b/core/src/test/java/com/github/tonivade/purefun/concurrent/FutureTest.java
@@ -294,6 +294,6 @@ public void noDeadlock() {
   }
 
   private Future<Unit> currentThread(Executor executor, List<String> result) {
-    return Future.exec(executor, () -> result.add(Thread.currentThread().getName()));
+    return Future.exec(executor, () -> result.add("thread-" + Thread.currentThread().threadId()));
   }
 }
diff --git a/core/src/test/java/com/github/tonivade/purefun/concurrent/ParTest.java b/core/src/test/java/com/github/tonivade/purefun/concurrent/ParTest.java
index d69eb21d0..99f80959d 100644
--- a/core/src/test/java/com/github/tonivade/purefun/concurrent/ParTest.java
+++ b/core/src/test/java/com/github/tonivade/purefun/concurrent/ParTest.java
@@ -15,6 +15,7 @@
 import static org.mockito.Mockito.verify;
 import java.time.Duration;
 import java.util.List;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
@@ -42,7 +43,7 @@ public void onSuccess(@Mock Consumer1<String> consumerSuccess) {
 
   @Test
   public void onFailure(@Mock Consumer1<Throwable> consumerFailure) {
-    UnsupportedOperationException error = new UnsupportedOperationException();
+    var error = new UnsupportedOperationException();
     Par<String> par = Par.<String>failure(error).onFailure(consumerFailure);
 
     Try<String> result = par.apply(Future.DEFAULT_EXECUTOR).await();
@@ -144,13 +145,13 @@ public void sleep() {
   }
 
   private String currentThread() throws InterruptedException {
-    String name = Thread.currentThread().getName();
+    var id = "thread-" + Thread.currentThread().threadId();
     Thread.sleep(100);
-    return name;
+    return id;
   }
 
   private void currentThread(Consumer1<String> consumer) throws InterruptedException {
-    consumer.accept(Thread.currentThread().getName());
+    consumer.accept("thread-" + Thread.currentThread().threadId());
     Thread.sleep(100);
   }
 }
\ No newline at end of file
diff --git a/core/src/test/java/com/github/tonivade/purefun/data/RangeTest.java b/core/src/test/java/com/github/tonivade/purefun/data/RangeTest.java
index 7b749c5a2..546a70c6a 100644
--- a/core/src/test/java/com/github/tonivade/purefun/data/RangeTest.java
+++ b/core/src/test/java/com/github/tonivade/purefun/data/RangeTest.java
@@ -4,14 +4,11 @@
  */
 package com.github.tonivade.purefun.data;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 import org.junit.jupiter.api.Test;
 
 import static com.github.tonivade.purefun.data.Sequence.arrayOf;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RangeTest {
 
@@ -31,4 +28,9 @@ public void range() {
         () -> assertEquals(arrayOf(1, 2, 3, 4, 5, 6, 7, 8, 9), range.collect())
     );
   }
+
+  @Test
+  public void validRange() {
+    assertThrows(IllegalArgumentException.class, () -> Range.of(10, 1));
+  }
 }
\ No newline at end of file
diff --git a/core/src/test/java/com/github/tonivade/purefun/type/ConstTest.java b/core/src/test/java/com/github/tonivade/purefun/type/ConstTest.java
index 944ce55f4..4fd7fcfa3 100644
--- a/core/src/test/java/com/github/tonivade/purefun/type/ConstTest.java
+++ b/core/src/test/java/com/github/tonivade/purefun/type/ConstTest.java
@@ -17,6 +17,6 @@ public void retag() {
     Const<String, Float> retag = val.retag();
 
     assertEquals(retag, val);
-    assertEquals(retag.get(), val.get());
+    assertEquals(retag.value(), val.value());
   }
 }
diff --git a/core/src/test/java/com/github/tonivade/purefun/type/IdTest.java b/core/src/test/java/com/github/tonivade/purefun/type/IdTest.java
index 6fd438196..37c72e373 100644
--- a/core/src/test/java/com/github/tonivade/purefun/type/IdTest.java
+++ b/core/src/test/java/com/github/tonivade/purefun/type/IdTest.java
@@ -20,7 +20,7 @@ public void idTest() {
     Id<String> id = Id.of("hola mundo!");
 
     assertAll(
-        () -> assertEquals("hola mundo!", id.get()),
+        () -> assertEquals("hola mundo!", id.value()),
         () -> assertEquals(Id.of("HOLA MUNDO!"), id.map(toUpperCase)),
         () -> assertEquals(Id.of("HOLA MUNDO!"), id.flatMap(toUpperCase.andThen(Id::of))));
   }
diff --git a/effect/src/test/java/com/github/tonivade/purefun/effect/ZIOTest.java b/effect/src/test/java/com/github/tonivade/purefun/effect/ZIOTest.java
index 0f0dcd33b..7c1f85b7c 100644
--- a/effect/src/test/java/com/github/tonivade/purefun/effect/ZIOTest.java
+++ b/effect/src/test/java/com/github/tonivade/purefun/effect/ZIOTest.java
@@ -40,27 +40,27 @@
 
 @ExtendWith(MockitoExtension.class)
 public class ZIOTest {
-  
+
   @Test
   public void recover() {
     PureIO<Nothing, Nothing, String> ups = PureIO.fromEither(() -> {
       throw new RuntimeException("ups!");
     });
-    
+
     assertEquals("ups!", PureIO.redeem(ups).provide(nothing()).getLeft().getMessage());
   }
-  
+
   @Test
   public void accessM() {
     PureIO<String, Nothing, String> access = PureIO.<String, Nothing, String>access(a -> a.toUpperCase());
-    
+
     assertEquals(Either.right("HELLO WORLD"), access.provide("hello world"));
   }
-  
+
   @Test
   public void pure() {
     Either<Nothing, String> result = PureIO.<Nothing, Nothing, String>pure("hello world").provide(nothing());
-    
+
     assertEquals(Either.right("hello world"), result);
   }
 
@@ -81,38 +81,38 @@ public void swapLeft() {
   @Test
   public void swapRight() {
     Either<String, Integer> result = PureIO.<Nothing, Integer, String>pure("value").swap().provide(nothing());
-    
+
     assertEquals(Either.left("value"), result);
   }
-  
+
   @Test
   public void task() {
     Either<Throwable, String> result = PureIO.<Nothing, String>task(() -> "hello world").provide(nothing());
 
     assertEquals(Either.right("hello world"), result);
   }
-  
+
   @Test
   public void laterRight() {
     Either<Throwable, String> result = PureIO.<Nothing, Throwable, String>fromEither(() -> Either.right("hello world")).provide(nothing());
 
     assertEquals(Either.right("hello world"), result);
   }
-  
+
   @Test
   public void laterLeft() {
     Either<String, Throwable> result = PureIO.<Nothing, String, Throwable>fromEither(() -> Either.left("hello world")).provide(nothing());
 
     assertEquals(Either.left("hello world"), result);
   }
-  
+
   @Test
   public void deferRight() {
     Either<Throwable, String> result = PureIO.<Nothing, Throwable, String>defer(() -> PureIO.pure("hello world")).provide(nothing());
 
     assertEquals(Either.right("hello world"), result);
   }
-  
+
   @Test
   public void deferLeft() {
     Either<String, Throwable> result = PureIO.<Nothing, String, Throwable>defer(() -> PureIO.raiseError("hello world")).provide(nothing());
@@ -225,28 +225,28 @@ public void bracket(@Mock ResultSet resultSet) throws SQLException {
     assertEquals(Either.right("value"), bracket.provide(nothing()));
     verify(resultSet).close();
   }
-  
+
   @Test
   public void asyncSuccess() {
     PureIO<Nothing, Throwable, String> async = PureIO.async((env, callback) -> {
       Thread.sleep(100);
       callback.accept(Try.success(Either.right("1")));
     });
-    
+
     Either<Throwable, String> result = async.provide(nothing());
-    
+
     assertEquals("1", result.get());
   }
-  
+
   @Test
   public void asyncFailure() {
     PureIO<Nothing, Throwable, String> async = PureIO.async((env, callback) -> {
       Thread.sleep(100);
       callback.accept(Try.success(Either.left(new UnsupportedOperationException())));
     });
-    
+
     Either<Throwable, String> result = async.provide(nothing());
-   
+
     assertTrue(result.getLeft() instanceof UnsupportedOperationException);
   }
 
@@ -254,7 +254,7 @@ public void asyncFailure() {
   public void safeRunAsync() {
     Ref<ImmutableList<String>> ref = Ref.of(ImmutableList.empty());
     UIO<ImmutableList<String>> currentThread =
-        ref.updateAndGet(list -> list.append(Thread.currentThread().getName()));
+        ref.updateAndGet(list -> list.append("thread-" + Thread.currentThread().threadId()));
 
     UIO<ImmutableList<String>> program = currentThread
         .andThen(currentThread
@@ -324,13 +324,13 @@ public void repeatFailure(@Mock Producer<Either<Throwable, ? extends String>> co
     assertTrue(provide.isLeft());
     verify(computation, times(4)).get();
   }
-  
+
   @Test
   public void timed() {
     PureIO<Nothing, Throwable, Tuple2<Duration, Unit>> timed = PureIO.<Nothing, Throwable>sleep(Duration.ofMillis(100)).timed();
-    
+
     Either<Throwable, Tuple2<Duration, Unit>> provide = timed.provide(nothing());
-    
+
     assertTrue(provide.getRight().get1().toMillis() >= 100);
   }
 
@@ -354,48 +354,48 @@ public void stackSafety() {
     assertEquals(705082704, sum.unsafeRunSync());
     assertEquals(Try.success(705082704), futureSum.await());
   }
-  
+
   @Test
   public void refineOrDie() {
     PureIO<Nothing, Throwable, String> error = PureIO.raiseError(new IOException());
-    
+
     PureIO<Nothing, IOException, String> refine = error.refineOrDie(IOException.class);
     PureIO<Nothing, UnsupportedOperationException, String> die = error.refineOrDie(UnsupportedOperationException.class);
-    
+
     assertEquals(IOException.class, refine.provide(nothing()).getLeft().getClass());
     assertThrows(ClassCastException.class, () -> die.provide(nothing()));
   }
-  
+
   @Test
   public void toURIO() {
     PureIO<Nothing, Integer, String> unsupported = PureIO.raiseError(3);
     PureIO<Nothing, Throwable, String> error = PureIO.raiseError(new IOException());
     PureIO<Nothing, Throwable, String> success = PureIO.pure("hola");
-    
+
     assertEquals("hola", success.toURIO().unsafeRunSync(nothing()));
     assertThrows(IOException.class, () -> error.toURIO().unsafeRunSync(nothing()));
     assertThrows(ClassCastException.class, () -> unsupported.toURIO().unsafeRunSync(nothing()));
   }
-  
+
   @Test
   public void toRIO() {
     PureIO<Nothing, Integer, String> unsupported = PureIO.raiseError(3);
     IOException exception = new IOException();
     PureIO<Nothing, Throwable, String> error = PureIO.raiseError(exception);
     PureIO<Nothing, Throwable, String> success = PureIO.pure("hola");
-    
+
     assertEquals(Try.success("hola"), success.toRIO().safeRunSync(nothing()));
     assertEquals(Try.failure(exception), error.toRIO().safeRunSync(nothing()));
     assertThrows(ClassCastException.class, () -> unsupported.toRIO().safeRunSync(nothing()));
   }
-  
+
   @Test
   public void traverse() {
     PureIO<Nothing, Throwable, String> left = PureIO.task(() -> "left");
     PureIO<Nothing, Throwable, String> right = PureIO.task(() -> "right");
-    
+
     PureIO<Nothing, Throwable, Sequence<String>> traverse = PureIO.traverse(listOf(left, right));
-    
+
     assertEquals(Either.right(listOf("left", "right")), traverse.provide(nothing()));
   }
 
@@ -404,9 +404,9 @@ public void raceA() {
     PureIO<Nothing, Nothing, Either<Integer, String>> race = PureIO.race(
         PureIO.<Nothing, Nothing>sleep(Duration.ofMillis(10)).map(x -> 10),
         PureIO.<Nothing, Nothing>sleep(Duration.ofMillis(100)).map(x -> "b"));
-    
+
     Either<Integer, String> orElseThrow = race.provide(nothing()).get();
-    
+
     assertEquals(Either.left(10), orElseThrow);
   }
 
@@ -415,12 +415,12 @@ public void raceB() {
     PureIO<Nothing, Nothing, Either<Integer, String>> race = PureIO.race(
         PureIO.<Nothing, Nothing>sleep(Duration.ofMillis(100)).map(x -> 10),
         PureIO.<Nothing, Nothing>sleep(Duration.ofMillis(10)).map(x -> "b"));
-    
+
     Either<Integer, String> orElseThrow = race.provide(nothing()).get();
-    
+
     assertEquals(Either.right("b"), orElseThrow);
   }
-  
+
   @Test
   public void fork() {
     PureIO<Nothing, Throwable, String> result = For.with(PureIOInstances.<Nothing, Throwable>monad())
@@ -431,17 +431,17 @@ public void fork() {
         return sleep.andThen(task).fork();
       })
       .flatMap(Fiber::join).fix(toPureIO());
-    
+
     Either<Throwable, String> orElseThrow = result.runAsync(nothing()).getOrElseThrow();
 
     assertEquals(Either.right("hola toni"), orElseThrow);
   }
-  
+
   @Test
   public void timeoutFail() {
     assertThrows(TimeoutException.class, () -> PureIO.never().timeout(Duration.ofSeconds(1)).provide(nothing()));
   }
-  
+
   @Test
   public void timeoutSuccess() {
     assertEquals(Either.right(1), PureIO.pure(1).timeout(Duration.ofSeconds(1)).provide(nothing()));
diff --git a/free/src/main/java/com/github/tonivade/purefun/free/FreeAp.java b/free/src/main/java/com/github/tonivade/purefun/free/FreeAp.java
index 4ea3d8e8b..609ab5d77 100644
--- a/free/src/main/java/com/github/tonivade/purefun/free/FreeAp.java
+++ b/free/src/main/java/com/github/tonivade/purefun/free/FreeAp.java
@@ -48,7 +48,7 @@ default <G extends Witness> FreeAp<G, A> flatCompile(
   }
 
   default <M> M analyze(FunctionK<F, Kind<Const_, M>> functionK, Applicative<Kind<Const_, M>> applicative) {
-    return foldMap(functionK, applicative).fix(toConst()).get();
+    return foldMap(functionK, applicative).fix(toConst()).value();
   }
 
   default Free<F, A> monad() {
diff --git a/free/src/test/java/com/github/tonivade/purefun/free/CofreeTest.java b/free/src/test/java/com/github/tonivade/purefun/free/CofreeTest.java
index 0ed444a42..af91128ed 100644
--- a/free/src/test/java/com/github/tonivade/purefun/free/CofreeTest.java
+++ b/free/src/test/java/com/github/tonivade/purefun/free/CofreeTest.java
@@ -45,7 +45,7 @@ public void testMap() {
           .flatMap(Cofree::tailForced)
           .tuple().fix(toId());
 
-    assertEquals(Tuple.of(2, 4, 6, 8), tuple4Id.get().map(Cofree::extract, Cofree::extract, Cofree::extract, Cofree::extract));
+    assertEquals(Tuple.of(2, 4, 6, 8), tuple4Id.value().map(Cofree::extract, Cofree::extract, Cofree::extract, Cofree::extract));
   }
 
   @Test
diff --git a/free/src/test/java/com/github/tonivade/purefun/free/FreeApTest.java b/free/src/test/java/com/github/tonivade/purefun/free/FreeApTest.java
index 7c3d7d354..03d26f732 100644
--- a/free/src/test/java/com/github/tonivade/purefun/free/FreeApTest.java
+++ b/free/src/test/java/com/github/tonivade/purefun/free/FreeApTest.java
@@ -94,7 +94,7 @@ public void compile() {
     FreeAp<Id_, Integer> compile = readInt.compile(idTransform());
     Id<Integer> fold = compile.fold(IdInstances.applicative()).fix(toId());
 
-    assertEquals(5, fold.get());
+    assertEquals(5, fold.value());
   }
 
   @Test
diff --git a/gradle.properties b/gradle.properties
index 74dff2a44..97c70d49d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-version=4.3-SNAPSHOT
+version=5.0-SNAPSHOT
+systemProp.sonar.gradle.skipCompile=true
\ No newline at end of file
diff --git a/instances/src/main/java/com/github/tonivade/purefun/instances/ConstInstances.java b/instances/src/main/java/com/github/tonivade/purefun/instances/ConstInstances.java
index 0b9571f03..908ee579d 100644
--- a/instances/src/main/java/com/github/tonivade/purefun/instances/ConstInstances.java
+++ b/instances/src/main/java/com/github/tonivade/purefun/instances/ConstInstances.java
@@ -25,7 +25,7 @@
 public interface ConstInstances {
 
   static <T, A> Eq<Kind<Kind<Const_, T>, A>> eq(Eq<T> eq) {
-    return (a, b) -> eq.eqv(a.fix(ConstOf::narrowK).get(), a.fix(ConstOf::narrowK).get());
+    return (a, b) -> eq.eqv(a.fix(ConstOf::narrowK).value(), a.fix(ConstOf::narrowK).value());
   }
 
   static <T> Functor<Kind<Const_, T>> functor() {
@@ -78,8 +78,8 @@ default <A, B> Const<T, B> ap(
       Kind<Kind<Const_, T>, ? extends A> value, 
       Kind<Kind<Const_, T>, ? extends Function1<? super A, ? extends B>> apply) {
     return Const.of(monoid().combine(
-            apply.fix(ConstOf::narrowK).<B>retag().get(),
-            value.fix(ConstOf::narrowK).<B>retag().get()));
+            apply.fix(ConstOf::narrowK).<B>retag().value(),
+            value.fix(ConstOf::narrowK).<B>retag().value()));
   }
 }
 
diff --git a/instances/src/main/java/com/github/tonivade/purefun/instances/EitherInstances.java b/instances/src/main/java/com/github/tonivade/purefun/instances/EitherInstances.java
index 602a1feb8..e09ca74ef 100644
--- a/instances/src/main/java/com/github/tonivade/purefun/instances/EitherInstances.java
+++ b/instances/src/main/java/com/github/tonivade/purefun/instances/EitherInstances.java
@@ -29,11 +29,11 @@ public interface EitherInstances {
 
   static <L, R> Eq<Kind<Kind<Either_, L>, R>> eq(Eq<L> leftEq, Eq<R> rightEq) {
     return (a, b) -> {
-      if (a instanceof Either.Left<L, R> leftA && b instanceof Either.Left<L, R> leftB) {
-        return leftEq.eqv(leftA.getLeft(), leftB.getLeft());
+      if (a instanceof Either.Left<L, R>(var leftA) && b instanceof Either.Left<L, R>(var leftB)) {
+        return leftEq.eqv(leftA, leftB);
       }
-      if (a instanceof Either.Right<L, R> rightA && b instanceof Either.Right<L, R> rightB) {
-        return rightEq.eqv(rightA.getRight(), rightB.getRight());
+      if (a instanceof Either.Right<L, R>(var rightA) && b instanceof Either.Right<L, R>(var rightB)) {
+        return rightEq.eqv(rightA, rightB);
       }
       return false;
     };
@@ -162,7 +162,7 @@ default <A, B> B foldLeft(Kind<Kind<Either_, L>, ? extends A> value, B initial,
   default <A, B> Eval<B> foldRight(Kind<Kind<Either_, L>, ? extends A> value, Eval<? extends B> initial,
       Function2<? super A, ? super Eval<? extends B>, ? extends Eval<? extends B>> mapper) {
     return EitherOf.<L, A>narrowK(value).fold(
-        cons(initial).andThen(EvalOf::<B>narrowK), 
+        cons(initial).andThen(EvalOf::<B>narrowK),
         a -> mapper.andThen(EvalOf::<B>narrowK).apply(a, initial));
   }
 }
diff --git a/instances/src/main/java/com/github/tonivade/purefun/instances/IdInstances.java b/instances/src/main/java/com/github/tonivade/purefun/instances/IdInstances.java
index af4901cb1..506923479 100644
--- a/instances/src/main/java/com/github/tonivade/purefun/instances/IdInstances.java
+++ b/instances/src/main/java/com/github/tonivade/purefun/instances/IdInstances.java
@@ -26,7 +26,7 @@
 public interface IdInstances {
 
   static <T> Eq<Kind<Id_, T>> eq(Eq<T> idEq) {
-    return (a, b) -> idEq.eqv(IdOf.narrowK(a).get(), IdOf.narrowK(b).get());
+    return (a, b) -> idEq.eqv(IdOf.narrowK(a).value(), IdOf.narrowK(b).value());
   }
 
   static Functor<Id_> functor() {
@@ -104,7 +104,7 @@ default <A, B> Kind<Id_, B> coflatMap(Kind<Id_, ? extends A> value, Function1<?
 
   @Override
   default <A> A extract(Kind<Id_, ? extends A> value) {
-    return IdOf.narrowK(value).get();
+    return IdOf.narrowK(value).value();
   }
 }
 
@@ -114,12 +114,12 @@ interface IdFoldable extends Foldable<Id_> {
 
   @Override
   default <A, B> B foldLeft(Kind<Id_, ? extends A> value, B initial, Function2<? super B, ? super A, ? extends B> mapper) {
-    return mapper.apply(initial, value.fix(toId()).get());
+    return mapper.apply(initial, value.fix(toId()).value());
   }
 
   @Override
   default <A, B> Eval<B> foldRight(Kind<Id_, ? extends A> value, Eval<? extends B> initial, Function2<? super A, ? super Eval<? extends B>, ? extends Eval<? extends B>> mapper) {
-    return EvalOf.narrowK(mapper.apply(value.fix(toId()).get(), initial));
+    return EvalOf.narrowK(mapper.apply(value.fix(toId()).value(), initial));
   }
 }
 
@@ -131,7 +131,7 @@ interface IdTraverse extends Traverse<Id_>, IdFoldable {
   default <G extends Witness, T, R> Kind<G, Kind<Id_, R>> traverse(
       Applicative<G> applicative, Kind<Id_, T> value,
       Function1<? super T, ? extends Kind<G, ? extends R>> mapper) {
-    Kind<G, ? extends R> apply = mapper.apply(value.fix(toId()).get());
+    Kind<G, ? extends R> apply = mapper.apply(value.fix(toId()).value());
     return applicative.map(apply, Id::of);
   }
 }
diff --git a/instances/src/main/java/com/github/tonivade/purefun/instances/OptionInstances.java b/instances/src/main/java/com/github/tonivade/purefun/instances/OptionInstances.java
index f0ba780d9..1741107ca 100644
--- a/instances/src/main/java/com/github/tonivade/purefun/instances/OptionInstances.java
+++ b/instances/src/main/java/com/github/tonivade/purefun/instances/OptionInstances.java
@@ -36,10 +36,10 @@ public interface OptionInstances {
 
   static <T> Eq<Kind<Option_, T>> eq(Eq<T> eqSome) {
     return (a, b) -> {
-      if (a instanceof Option.Some<T> someA && b instanceof Option.Some<T> someB) {
-        return eqSome.eqv(someA.getOrElseThrow(), someB.getOrElseThrow());
+      if (a instanceof Option.Some<T>(var valueA) && b instanceof Option.Some<T>(var valueB)) {
+        return eqSome.eqv(valueA, valueB);
       }
-      return a instanceof Option.None<T> && b instanceof Option.None<T>;
+      return a instanceof Option.None && b instanceof Option.None;
     };
   }
 
@@ -99,7 +99,7 @@ interface OptionApplicative extends OptionPure {
   OptionApplicative INSTANCE = new OptionApplicative() {};
 
   @Override
-  default <T, R> Kind<Option_, R> ap(Kind<Option_, ? extends T> value, 
+  default <T, R> Kind<Option_, R> ap(Kind<Option_, ? extends T> value,
       Kind<Option_, ? extends Function1<? super T, ? extends R>> apply) {
     return value.fix(toOption()).flatMap(t -> OptionOf.narrowK(apply).map(f -> f.apply(t)));
   }
diff --git a/instances/src/main/java/com/github/tonivade/purefun/instances/TryInstances.java b/instances/src/main/java/com/github/tonivade/purefun/instances/TryInstances.java
index 14410b18e..de6c615f3 100644
--- a/instances/src/main/java/com/github/tonivade/purefun/instances/TryInstances.java
+++ b/instances/src/main/java/com/github/tonivade/purefun/instances/TryInstances.java
@@ -29,11 +29,11 @@ public interface TryInstances {
   static <T> Eq<Kind<Try_, T>> eq(Eq<T> eqSuccess) {
     final Eq<Throwable> eqFailure = Eq.throwable();
     return (a, b) -> {
-      if (a instanceof Try.Failure<T> failureA && b instanceof Try.Failure<T> failureB) {
-        return eqFailure.eqv(failureA.getCause(), failureB.getCause());
+      if (a instanceof Try.Failure(var causeA) && b instanceof Try.Failure(var causeB)) {
+        return eqFailure.eqv(causeA, causeB);
       }
-      if (a instanceof Try.Success<T> successA && b instanceof Try.Success<T> successB) {
-        return eqSuccess.eqv(successA.getOrElseThrow(), successB.getOrElseThrow());
+      if (a instanceof Try.Success<T>(var valueA) && b instanceof Try.Success<T>(var valueB)) {
+        return eqSuccess.eqv(valueA, valueB);
       }
       return false;
     };
@@ -91,7 +91,7 @@ interface TryApplicative extends TryPure {
   TryApplicative INSTANCE = new TryApplicative() {};
 
   @Override
-  default <T, R> Kind<Try_, R> ap(Kind<Try_, ? extends T> value, 
+  default <T, R> Kind<Try_, R> ap(Kind<Try_, ? extends T> value,
       Kind<Try_, ? extends Function1<? super T, ? extends R>> apply) {
     return TryOf.narrowK(value).flatMap(t -> TryOf.narrowK(apply).map(f -> f.apply(t)));
   }
@@ -142,7 +142,7 @@ default <A, B> B foldLeft(Kind<Try_, ? extends A> value, B initial, Function2<?
   default <A, B> Eval<B> foldRight(Kind<Try_, ? extends A> value, Eval<? extends B> initial,
       Function2<? super A, ? super Eval<? extends B>, ? extends Eval<? extends B>> mapper) {
     return TryOf.<A>narrowK(value).fold(
-        cons(initial).andThen(EvalOf::<B>narrowK), 
+        cons(initial).andThen(EvalOf::<B>narrowK),
         a -> mapper.andThen(EvalOf::<B>narrowK).apply(a, initial));
   }
 }
diff --git a/instances/src/main/java/com/github/tonivade/purefun/instances/ValidationInstances.java b/instances/src/main/java/com/github/tonivade/purefun/instances/ValidationInstances.java
index a6a3004ef..ff6b2c9ba 100644
--- a/instances/src/main/java/com/github/tonivade/purefun/instances/ValidationInstances.java
+++ b/instances/src/main/java/com/github/tonivade/purefun/instances/ValidationInstances.java
@@ -27,11 +27,11 @@ public interface ValidationInstances {
 
   static <E, T> Eq<Kind<Kind<Validation_, E>, T>> eq(Eq<E> errorEq, Eq<T> validEq) {
     return (a, b) -> {
-      if (a instanceof Validation.Invalid<E, T> invalidA && b instanceof Validation.Invalid<E, T> invalidB) {
-        return errorEq.eqv(invalidA.getError(), invalidB.getError());
+      if (a instanceof Validation.Invalid<E, T>(var invalidA) && b instanceof Validation.Invalid<E, T>(var invalidB)) {
+        return errorEq.eqv(invalidA, invalidB);
       }
-      if (a instanceof Validation.Valid<E, T> validA && b instanceof Validation.Valid<E, T> validB) {
-        return validEq.eqv(validA.get(), validB.get());
+      if (a instanceof Validation.Valid<E, T>(var validA) && b instanceof Validation.Valid<E, T>(var validB)) {
+        return validEq.eqv(validA, validB);
       }
       return false;
     };
@@ -72,7 +72,7 @@ interface ValidationFunctor<E> extends Functor<Kind<Validation_, E>> {
   ValidationFunctor INSTANCE = new ValidationFunctor() {};
 
   @Override
-  default <T, R> Validation<E, R> map(Kind<Kind<Validation_, E>, ? extends T> value, 
+  default <T, R> Validation<E, R> map(Kind<Kind<Validation_, E>, ? extends T> value,
       Function1<? super T, ? extends R> map) {
     return ValidationOf.narrowK(value).map(map);
   }
diff --git a/monad/src/test/java/com/github/tonivade/purefun/monad/IOTest.java b/monad/src/test/java/com/github/tonivade/purefun/monad/IOTest.java
index 16f9d12c3..6d09b7386 100644
--- a/monad/src/test/java/com/github/tonivade/purefun/monad/IOTest.java
+++ b/monad/src/test/java/com/github/tonivade/purefun/monad/IOTest.java
@@ -64,29 +64,29 @@ public void pure() {
             pure.flatMap(string -> IO.task(() -> string.split(" "))).unsafeRunSync()),
         () -> assertEquals(Integer.valueOf(100), pure.andThen(IO.task(() -> 100)).unsafeRunSync()));
   }
-  
+
   @Test
   public void asyncSuccess() {
     IO<String> async = IO.async(callback -> {
-      System.out.println(Thread.currentThread().getName());
+      System.out.println(Thread.currentThread().threadId());
       Thread.sleep(100);
       callback.accept(Try.success("1"));
     });
-    
+
     Future<String> foldMap = IO.forked().andThen(async).runAsync();
-    
+
     assertEquals("1", foldMap.getOrElseThrow());
   }
-  
+
   @Test
   public void asyncFailure() {
     IO<String> async = IO.async(callback -> {
       Thread.sleep(100);
       callback.accept(Try.failure(new UnsupportedOperationException()));
     });
-    
+
     Future<String> foldMap = IO.forked().andThen(async).runAsync();
-   
+
     assertThrows(UnsupportedOperationException.class, foldMap::getOrElseThrow);
   }
 
@@ -257,24 +257,24 @@ public void timed() {
     assertEquals(705082704, result.get2());
     assertTrue(result.get1().toMillis() > 0);
   }
-  
+
   @Test
   public void timeoutFail() {
     assertThrows(TimeoutException.class, IO.never().timeout(Duration.ofSeconds(1))::unsafeRunSync);
   }
-  
+
   @Test
   public void timeoutSuccess() {
     assertEquals(1, IO.pure(1).timeout(Duration.ofSeconds(1)).unsafeRunSync());
   }
-  
+
   @Test
   public void traverse() {
     IO<String> left = IO.task(() -> "left");
     IO<String> right = IO.task(() -> "right");
-    
+
     IO<Sequence<String>> traverse = IO.traverse(listOf(left, right));
-    
+
     assertEquals(listOf("left", "right"), traverse.unsafeRunSync());
   }
 
@@ -283,9 +283,9 @@ public void raceA() {
     IO<Either<Integer, String>> race = IO.race(
         IO.delay(Duration.ofMillis(10), () -> 10),
         IO.delay(Duration.ofMillis(100), () -> "b"));
-    
+
     Either<Integer, String> orElseThrow = race.unsafeRunSync();
-    
+
     assertEquals(Either.left(10), orElseThrow);
   }
 
@@ -294,40 +294,40 @@ public void raceB() {
     IO<Either<Integer, String>> race = IO.race(
         IO.delay(Duration.ofMillis(100), () -> 10),
         IO.delay(Duration.ofMillis(10), () -> "b"));
-    
+
     Either<Integer, String> orElseThrow = race.unsafeRunSync();
-    
+
     assertEquals(Either.right("b"), orElseThrow);
   }
-  
+
   @Test
   public void fork() {
     IO<String> result = Instances.<IO_>monad().use()
       .then(IO.pure("hola"))
       .flatMap(hello -> IO.delay(Duration.ofSeconds(1), () -> hello + " toni").fork())
       .flatMap(Fiber::join).fix(toIO());
-    
+
     String orElseThrow = result.runAsync().getOrElseThrow();
 
     assertEquals("hola toni", orElseThrow);
   }
-  
+
   @Test
   public void memoize(@Mock Function1<String, String> toUpperCase) {
     when(toUpperCase.apply(any()))
       .thenAnswer(args -> args.getArgument(0, String.class).toUpperCase());
-    
+
     IO<Function1<String, IO<String>>> memoized = IO.memoize((String str) -> IO.pure(toUpperCase.apply(str)));
-    
+
     IO<String> flatMap = memoized.flatMap(x -> x.apply("hola"));
     flatMap.unsafeRunSync();
     flatMap.unsafeRunSync();
     flatMap.unsafeRunSync();
     flatMap.unsafeRunSync();
-    
+
     verify(toUpperCase).apply("hola");
   }
-  
+
   @Test
   public void fibSyncTest() {
     assertAll(
@@ -343,7 +343,7 @@ public void fibSyncTest() {
         () -> assertEquals(6765, fibSync(20).unsafeRunSync())
         );
   }
-  
+
   @Test
   public void fibAsyncTest() {
     assertAll(
@@ -398,7 +398,7 @@ private IO<Integer> sum(Integer n, Integer sum) {
   private IO<ImmutableList<String>> currentThreadIO() {
     Reference<IO_, ImmutableList<String>> ref = IOInstances.monadDefer().ref(ImmutableList.empty());
     IO<ImmutableList<String>> currentThread =
-        ref.updateAndGet(list -> list.append(Thread.currentThread().getName())).fix(toIO());
+        ref.updateAndGet(list -> list.append("thread-" + Thread.currentThread().threadId())).fix(toIO());
 
     return currentThread
         .andThen(currentThread
diff --git a/typeclasses/src/main/java/com/github/tonivade/purefun/typeclasses/Traverse.java b/typeclasses/src/main/java/com/github/tonivade/purefun/typeclasses/Traverse.java
index feae7d380..3a0dbd7d9 100644
--- a/typeclasses/src/main/java/com/github/tonivade/purefun/typeclasses/Traverse.java
+++ b/typeclasses/src/main/java/com/github/tonivade/purefun/typeclasses/Traverse.java
@@ -26,7 +26,7 @@ default <G extends Witness, T> Kind<G, Kind<F, T>> sequence(Applicative<G> appli
   @Override
   default <T, R> Kind<F, R> map(Kind<F, ? extends T> value, Function1<? super T, ? extends R> map) {
     Kind<Id_, Kind<F, R>> traverse = traverse(Instances.<Id_>applicative(), value, t -> Id.of(map.apply(t)));
-    return traverse.fix(toId()).get();
+    return traverse.fix(toId()).value();
   }
 
   static <F extends Witness, G extends Witness> Traverse<Nested<F, G>> compose(Traverse<F> f, Traverse<G> g) {