diff --git a/src/flextype/core/Endpoints/Tokens.php b/src/flextype/core/Endpoints/Tokens.php
index 288642a7..ae7b4974 100644
--- a/src/flextype/core/Endpoints/Tokens.php
+++ b/src/flextype/core/Endpoints/Tokens.php
@@ -25,7 +25,7 @@ use function filesystem;
 class Tokens extends Api
 {
     /**
-     * Generate token
+     * Generate token.
      *
      * @param ServerRequestInterface $request  PSR7 request.
      * @param ResponseInterface      $response PSR7 response.
@@ -124,6 +124,9 @@ class Tokens extends Api
      */
     public function create(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
     {
+        // Get Request Parsed Body
+        $requestParsedBody = $request->getParsedBody();
+
         // Validate Api Request
         if (
             count($result = $this->validateApiRequest([
@@ -142,7 +145,7 @@ class Tokens extends Api
         ! entries()->has('tokens') and entries()->create('tokens', ['title' => 'Tokens']);
 
         // Create new entry
-        entries()->create('tokens/' . $token, array_merge($requestParsedBody['data'], ['hashed_access_token' => $hashed_access_token]));
+        entries()->create('tokens/' . $token, array_merge($requestParsedBody['data'] ?? [], ['hashed_access_token' => $hashed_access_token]));
 
         // Fetch entry
         $entryData = entries()->fetch('tokens/' . $token)->toArray();
@@ -207,18 +210,20 @@ class Tokens extends Api
             count($result = $this->validateApiRequest([
                 'request' => $request,
                 'api' => 'tokens',
-                'params' => ['token', 'id', 'access_token'],
+                'params' => ['token', 'id', 'access_token', 'data'],
             ])) > 0
         ) {
             return $this->getApiResponse($response, $this->getStatusCodeMessage($result['http_status_code']), $result['http_status_code']);
         }
 
         // Update entry
-        entries()->update('tokens/' . $requestParsedBody['id'], $requestParsedBody['data'] ?? []);
+        entries()->update('tokens/' . $requestParsedBody['id'], $requestParsedBody['data']);
 
         // Fetch entry
         $entryData = entries()->fetch('tokens/' . $requestParsedBody['id'])->toArray();
 
+        dd($entryData);
+        
         // Return response
         if (count($entryData) > 0) {
             return $this->getApiResponse($response, $entryData, 200);
diff --git a/src/flextype/routes/endpoints/tokens.php b/src/flextype/routes/endpoints/tokens.php
index 622084d5..d438ff7f 100644
--- a/src/flextype/routes/endpoints/tokens.php
+++ b/src/flextype/routes/endpoints/tokens.php
@@ -73,7 +73,8 @@ app()->post('/api/v0/tokens/verify-hash', [Tokens::class, 'verifyHash'])->setNam
  * Body:
  * token        - [REQUIRED] - Valid public token.
  * access_token - [REQUIRED] - Valid private access token.
- * 
+ * data         - [OPTIONAL] - Data to store for the token.
+ *
  * Returns:
  * Token entry object with the token entry that was just created.
  */