Moved the AddToPythonDictionary() method into each wrapper class using inheritance rather than calling based on the type member.