diff --git a/contracts/FleekAccessControl.sol b/contracts/FleekAccessControl.sol
index 733a3b9..ab8667c 100644
--- a/contracts/FleekAccessControl.sol
+++ b/contracts/FleekAccessControl.sol
@@ -41,6 +41,20 @@ abstract contract FleekAccessControl is AccessControl {
         _;
     }
 
+    function addTokenController(
+        uint256 tokenId,
+        address controller
+    ) public require requireMinted(tokenId) requireTokenOwner(tokenId) {
+        _grantRole(_tokenRole(tokenId, "CONTROLLER"), controller);
+    }
+
+    function removeTokenController(
+        uint256 tokenId,
+        address controller
+    ) public require requireMinted(tokenId) requireTokenOwner(tokenId) {
+        _revokeRole(_tokenRole(tokenId, "CONTROLLER"), controller);
+    }
+
     function _tokenRole(
         uint256 tokenId,
         string role
diff --git a/contracts/FleekERC721.sol b/contracts/FleekERC721.sol
index ad518d8..79acedc 100644
--- a/contracts/FleekERC721.sol
+++ b/contracts/FleekERC721.sol
@@ -13,8 +13,8 @@ contract FleekERC721 is ERC721, FleekAccessControl {
     using Counters for Counters.Counter;
 
     struct Build {
-        string _commit;
-        string _repository;
+        string commit;
+        string repository;
     }
 
     struct Site {
@@ -39,8 +39,8 @@ contract FleekERC721 is ERC721, FleekAccessControl {
         string memory repository
     ) public payable requireCollectionOwner returns (uint256) {
         uint256 tokenId = _tokenIds.current();
-        _grantRole(_tokenRole(tokenId), to);
         _mint(to, tokenId);
+        addTokenController(tokenId, to);
         _tokenIds.increment();
         _sites[tokenId] = Site(URI, ENS, 0, [Build(commit, repository)]);
         return tokenId;
@@ -75,8 +75,8 @@ contract FleekERC721 is ERC721, FleekAccessControl {
                 '"URI":"', site.URI, '",',
                 '"build:{',
                     '"id":"', site.currentBuild, '",',
-                    '"commit":"', site.builds[site.currentBuild]._commit, '",',
-                    '"repository":"', site.builds[site.currentBuild]._repository, '"'
+                    '"commit":"', site.builds[site.currentBuild].commit, '",',
+                    '"repository":"', site.builds[site.currentBuild].repository, '"'
                 '}',
             '}'
         );