diff --git a/codegen/templates/GithubObject.py b/codegen/templates/GithubObject.py
index 6ee14ba4..fcbce68e 100644
--- a/codegen/templates/GithubObject.py
+++ b/codegen/templates/GithubObject.py
@@ -1,14 +1,10 @@
 import PaginatedList
+from GithubObject import *
 
 {% for dependency in class.dependencies %}
 import {{ dependency }}
 {% endfor %}
 
-# This allows None as a valid value for an optional parameter
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
-
 class {{ class.name }}( object ):
     def __init__( self, requester, attributes, lazy ):
         self.__requester = requester
diff --git a/src/github/AuthenticatedUser.py b/src/github/AuthenticatedUser.py
index 21f7ccb7..1fb9614f 100644
--- a/src/github/AuthenticatedUser.py
+++ b/src/github/AuthenticatedUser.py
@@ -2,6 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Gist
 import Repository
 import NamedUser
@@ -11,11 +12,6 @@ import UserKey
 import Issue
 import Event
 import Authorization
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class AuthenticatedUser( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Authorization.py b/src/github/Authorization.py
index 37798c84..ee706cc8 100644
--- a/src/github/Authorization.py
+++ b/src/github/Authorization.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class Authorization( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Branch.py b/src/github/Branch.py
index 393c096a..60380e9d 100644
--- a/src/github/Branch.py
+++ b/src/github/Branch.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Commit
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Branch( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Commit.py b/src/github/Commit.py
index 77621c35..865f9cde 100644
--- a/src/github/Commit.py
+++ b/src/github/Commit.py
@@ -2,17 +2,13 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import CommitFile
 import NamedUser
 import GitCommit
 import CommitStats
 import Commit
 import CommitComment
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Commit( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/CommitComment.py b/src/github/CommitComment.py
index 88f02659..290fdd69 100644
--- a/src/github/CommitComment.py
+++ b/src/github/CommitComment.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class CommitComment( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/CommitFile.py b/src/github/CommitFile.py
index 02d3777d..ea1df2d2 100644
--- a/src/github/CommitFile.py
+++ b/src/github/CommitFile.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class CommitFile( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/CommitStats.py b/src/github/CommitStats.py
index ab48c3bf..3268bd5e 100644
--- a/src/github/CommitStats.py
+++ b/src/github/CommitStats.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class CommitStats( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Download.py b/src/github/Download.py
index d6ea7263..86ecbb15 100644
--- a/src/github/Download.py
+++ b/src/github/Download.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class Download( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Event.py b/src/github/Event.py
index 95ea45d0..d4a99462 100644
--- a/src/github/Event.py
+++ b/src/github/Event.py
@@ -2,14 +2,10 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Organization
 import Repository
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Event( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Gist.py b/src/github/Gist.py
index d1a885bf..8e12ade6 100644
--- a/src/github/Gist.py
+++ b/src/github/Gist.py
@@ -2,14 +2,10 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import NamedUser
 import Gist
 import GistComment
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Gist( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GistComment.py b/src/github/GistComment.py
index dce4698d..800faded 100644
--- a/src/github/GistComment.py
+++ b/src/github/GistComment.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class GistComment( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitAuthor.py b/src/github/GitAuthor.py
index 954678f7..ff54e7fb 100644
--- a/src/github/GitAuthor.py
+++ b/src/github/GitAuthor.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class GitAuthor( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitBlob.py b/src/github/GitBlob.py
index febf1a82..0a5408d4 100644
--- a/src/github/GitBlob.py
+++ b/src/github/GitBlob.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class GitBlob( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitCommit.py b/src/github/GitCommit.py
index 06d03a90..5f60daa8 100644
--- a/src/github/GitCommit.py
+++ b/src/github/GitCommit.py
@@ -2,14 +2,10 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import GitAuthor
 import GitCommit
 import GitTree
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class GitCommit( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitObject.py b/src/github/GitObject.py
index f471c093..d55ec5e1 100644
--- a/src/github/GitObject.py
+++ b/src/github/GitObject.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class GitObject( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitRef.py b/src/github/GitRef.py
index cb53f274..b7bc1bc8 100644
--- a/src/github/GitRef.py
+++ b/src/github/GitRef.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import GitObject
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class GitRef( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitTag.py b/src/github/GitTag.py
index a48348d8..fa02a1fd 100644
--- a/src/github/GitTag.py
+++ b/src/github/GitTag.py
@@ -2,13 +2,9 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import GitAuthor
 import GitObject
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class GitTag( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitTree.py b/src/github/GitTree.py
index cc42e29c..1c61c5f6 100644
--- a/src/github/GitTree.py
+++ b/src/github/GitTree.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import GitTreeElement
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class GitTree( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GitTreeElement.py b/src/github/GitTreeElement.py
index 75b69339..8821c581 100644
--- a/src/github/GitTreeElement.py
+++ b/src/github/GitTreeElement.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class GitTreeElement( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/GithubObject.py b/src/github/GithubObject.py
new file mode 100644
index 00000000..d3552f06
--- /dev/null
+++ b/src/github/GithubObject.py
@@ -0,0 +1,4 @@
+# This allows None as a valid value for an optional parameter
+class DefaultValueForOptionalParametersType:
+    pass
+DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
diff --git a/src/github/Hook.py b/src/github/Hook.py
index 63421c9a..0445edd6 100644
--- a/src/github/Hook.py
+++ b/src/github/Hook.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class Hook( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Issue.py b/src/github/Issue.py
index eb3d60e7..67900065 100644
--- a/src/github/Issue.py
+++ b/src/github/Issue.py
@@ -2,16 +2,12 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import IssueComment
 import IssueEvent
 import NamedUser
 import Milestone
 import Label
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Issue( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/IssueComment.py b/src/github/IssueComment.py
index 35fc3194..13e6c8db 100644
--- a/src/github/IssueComment.py
+++ b/src/github/IssueComment.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class IssueComment( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/IssueEvent.py b/src/github/IssueEvent.py
index 6d5ba4fd..4d5bd006 100644
--- a/src/github/IssueEvent.py
+++ b/src/github/IssueEvent.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class IssueEvent( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Label.py b/src/github/Label.py
index 5ebccdde..49ceefa9 100644
--- a/src/github/Label.py
+++ b/src/github/Label.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class Label( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Milestone.py b/src/github/Milestone.py
index 8199f3d5..bbc9bdcb 100644
--- a/src/github/Milestone.py
+++ b/src/github/Milestone.py
@@ -2,13 +2,9 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import NamedUser
 import Label
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Milestone( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/NamedUser.py b/src/github/NamedUser.py
index 8afcffbd..e5668e35 100644
--- a/src/github/NamedUser.py
+++ b/src/github/NamedUser.py
@@ -2,16 +2,12 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Organization
 import Gist
 import Event
 import Repository
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class NamedUser( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Organization.py b/src/github/Organization.py
index a3e3c726..97737805 100644
--- a/src/github/Organization.py
+++ b/src/github/Organization.py
@@ -2,16 +2,12 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Team
 import Plan
 import Event
 import Repository
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Organization( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Permissions.py b/src/github/Permissions.py
index cefc8fb8..7b78b712 100644
--- a/src/github/Permissions.py
+++ b/src/github/Permissions.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class Permissions( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Plan.py b/src/github/Plan.py
index e029744f..606a7139 100644
--- a/src/github/Plan.py
+++ b/src/github/Plan.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class Plan( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/PullRequest.py b/src/github/PullRequest.py
index 8aea5595..66d9642b 100644
--- a/src/github/PullRequest.py
+++ b/src/github/PullRequest.py
@@ -2,15 +2,11 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Commit
 import NamedUser
 import PullRequestComment
 import PullRequestFile
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class PullRequest( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/PullRequestComment.py b/src/github/PullRequestComment.py
index 8af4822e..fb401c51 100644
--- a/src/github/PullRequestComment.py
+++ b/src/github/PullRequestComment.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class PullRequestComment( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/PullRequestFile.py b/src/github/PullRequestFile.py
index 44389215..6a65705c 100644
--- a/src/github/PullRequestFile.py
+++ b/src/github/PullRequestFile.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class PullRequestFile( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Repository.py b/src/github/Repository.py
index 429afbb9..2176697d 100644
--- a/src/github/Repository.py
+++ b/src/github/Repository.py
@@ -2,6 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Branch
 import IssueEvent
 import Label
@@ -25,11 +26,6 @@ import Tag
 import GitTag
 import Download
 import Event
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Repository( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/RepositoryKey.py b/src/github/RepositoryKey.py
index 5e499351..6d573731 100644
--- a/src/github/RepositoryKey.py
+++ b/src/github/RepositoryKey.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class RepositoryKey( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Tag.py b/src/github/Tag.py
index 88eb24f1..9b0ef69b 100644
--- a/src/github/Tag.py
+++ b/src/github/Tag.py
@@ -2,12 +2,8 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Commit
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Tag( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/Team.py b/src/github/Team.py
index cff9f678..4e70d19e 100644
--- a/src/github/Team.py
+++ b/src/github/Team.py
@@ -2,13 +2,9 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
+from GithubObject import *
 import Repository
 import NamedUser
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
 
 class Team( object ):
     def __init__( self, requester, attributes, lazy ):
diff --git a/src/github/UserKey.py b/src/github/UserKey.py
index 226f27de..3f3fd346 100644
--- a/src/github/UserKey.py
+++ b/src/github/UserKey.py
@@ -2,11 +2,7 @@
 # Do not modify it manually, your work would be lost.
 
 import PaginatedList
-# This allows None as a valid value for an optional parameter
-
-class DefaultValueForOptionalParametersType:
-    pass
-DefaultValueForOptionalParameters = DefaultValueForOptionalParametersType()
+from GithubObject import *
 
 class UserKey( object ):
     def __init__( self, requester, attributes, lazy ):