diff --git a/Plan/api/build.gradle b/Plan/api/build.gradle
index 7c7e66c82..cb3447436 100644
--- a/Plan/api/build.gradle
+++ b/Plan/api/build.gradle
@@ -4,7 +4,7 @@ dependencies {
     compileOnly "com.google.code.gson:gson:$gsonVersion"
 }
 
-ext.apiVersion = '5.2-R0.6'
+ext.apiVersion = '5.2-R0.7'
 
 publishing {
     repositories {
diff --git a/Plan/api/src/main/java/com/djrapitops/plan/extension/builder/ValueBuilder.java b/Plan/api/src/main/java/com/djrapitops/plan/extension/builder/ValueBuilder.java
index 32fe0fa2f..1abf079a9 100644
--- a/Plan/api/src/main/java/com/djrapitops/plan/extension/builder/ValueBuilder.java
+++ b/Plan/api/src/main/java/com/djrapitops/plan/extension/builder/ValueBuilder.java
@@ -98,7 +98,7 @@ public interface ValueBuilder {
     ValueBuilder showOnTab(String tabName);
 
     /**
-     * {@link ValueBuilder#buildNumber(long)} specific method, format the value as a epoch ms timestamp.
+     * {@link ValueBuilder#buildNumber(Long)} specific method, format the value as a epoch ms timestamp.
      *
      * @return This builder.
      */
@@ -107,7 +107,7 @@ public interface ValueBuilder {
     }
 
     /**
-     * {@link ValueBuilder#buildNumber(long)} specific method, format the value as a epoch ms timestamp.
+     * {@link ValueBuilder#buildNumber(Long)} specific method, format the value as a epoch ms timestamp.
      *
      * @return This builder.
      */
@@ -116,7 +116,7 @@ public interface ValueBuilder {
     }
 
     /**
-     * {@link ValueBuilder#buildNumber(long)} specific method, format the value as milliseconds of time.
+     * {@link ValueBuilder#buildNumber(Long)} specific method, format the value as milliseconds of time.
      *
      * @return This builder.
      */
@@ -125,7 +125,7 @@ public interface ValueBuilder {
     }
 
     /**
-     * {@link ValueBuilder#buildNumber(long)} specific method, format the value with {@link FormatType}
+     * {@link ValueBuilder#buildNumber(Long)} specific method, format the value with {@link FormatType}
      *
      * @return This builder.
      */
@@ -168,7 +168,7 @@ public interface ValueBuilder {
      * @param value a non-floating point number.
      * @return a data value to give to {@link ExtensionDataBuilder}.
      */
-    DataValue<Long> buildNumber(long value);
+    DataValue<Long> buildNumber(Long value);
 
     /**
      * Build a Floating point number.
@@ -176,7 +176,7 @@ public interface ValueBuilder {
      * @param value a floating point number.
      * @return a data value to give to {@link ExtensionDataBuilder}.
      */
-    DataValue<Double> buildDouble(double value);
+    DataValue<Double> buildDouble(Double value);
 
     /**
      * Build a Percentage.
@@ -184,7 +184,7 @@ public interface ValueBuilder {
      * @param percentage value between 0.0 and 1.0
      * @return a data value to give to {@link ExtensionDataBuilder}.
      */
-    DataValue<Double> buildPercentage(double percentage);
+    DataValue<Double> buildPercentage(Double percentage);
 
     /**
      * Build a list of groups.
@@ -226,22 +226,22 @@ public interface ValueBuilder {
 
     /**
      * Lambda version for conditional return or throwing {@link com.djrapitops.plan.extension.NotReadyException}.
-     *
-     * {@link ValueBuilder#buildNumber(long)}
+     * <p>
+     * {@link ValueBuilder#buildNumber(Long)}
      */
     DataValue<Long> buildNumber(Supplier<Long> value);
 
     /**
      * Lambda version for conditional return or throwing {@link com.djrapitops.plan.extension.NotReadyException}.
      *
-     * {@link ValueBuilder#buildDouble(double)}
+     * {@link ValueBuilder#buildDouble(Double)}
      */
     DataValue<Double> buildDouble(Supplier<Double> value);
 
     /**
      * Lambda version for conditional return or throwing {@link com.djrapitops.plan.extension.NotReadyException}.
      *
-     * {@link ValueBuilder#buildPercentage(double)}
+     * {@link ValueBuilder#buildPercentage(Double)}
      */
     DataValue<Double> buildPercentage(Supplier<Double> percentage);
 
diff --git a/Plan/api/src/main/java/com/djrapitops/plan/extension/extractor/ExtensionExtractor.java b/Plan/api/src/main/java/com/djrapitops/plan/extension/extractor/ExtensionExtractor.java
index 7165a052d..446434d0b 100644
--- a/Plan/api/src/main/java/com/djrapitops/plan/extension/extractor/ExtensionExtractor.java
+++ b/Plan/api/src/main/java/com/djrapitops/plan/extension/extractor/ExtensionExtractor.java
@@ -309,7 +309,7 @@ public final class ExtensionExtractor {
         Method method = extensionMethod.getMethod();
 
         validateReturnType(method, ExtensionDataBuilder.class);
-        validateMethodArguments(method, false, UUID.class, String.class);
+        validateMethodArguments(method, false, UUID.class, String.class, Group.class);
     }
 
     private void validateConditionals() {
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/builder/ExtValueBuilder.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/builder/ExtValueBuilder.java
index ec317d8b1..4ab479a98 100644
--- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/builder/ExtValueBuilder.java
+++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/builder/ExtValueBuilder.java
@@ -181,17 +181,17 @@ public class ExtValueBuilder implements ValueBuilder {
     }
 
     @Override
-    public DataValue<Long> buildNumber(long value) {
+    public DataValue<Long> buildNumber(Long value) {
         return new NumberDataValue(value, getProviderInformation());
     }
 
     @Override
-    public DataValue<Double> buildDouble(double value) {
+    public DataValue<Double> buildDouble(Double value) {
         return new DoubleDataValue(value, getProviderInformation());
     }
 
     @Override
-    public DataValue<Double> buildPercentage(double value) {
+    public DataValue<Double> buildPercentage(Double value) {
         return new DoubleDataValue(value, getPercentageProviderInformation());
     }