--- a/lib/WineTestBot/Branches.pm
+++ b/lib/WineTestBot/Branches.pm
@@ -26,13 +26,13 @@
 
 package WineTestBot::Branch;
 
-use ObjectModel::Item;
+use WineTestBot::WineTestBotObjects;
 use WineTestBot::Config;
 
 use vars qw (@ISA @EXPORT);
 
 require Exporter;
-@ISA = qw(ObjectModel::Item Exporter);
+@ISA = qw(WineTestBot::WineTestBotItem Exporter);
 
 sub InitializeNew
 {
@@ -44,13 +44,13 @@
 package WineTestBot::Branches;
 
 use ObjectModel::BasicPropertyDescriptor;
-use ObjectModel::Collection;
 use ObjectModel::PropertyDescriptor;
+use WineTestBot::WineTestBotObjects;
 
 use vars qw (@ISA @EXPORT @PropertyDescriptors);
 
 require Exporter;
-@ISA = qw(ObjectModel::Collection Exporter);
+@ISA = qw(WineTestBot::WineTestBotCollection Exporter);
 @EXPORT = qw(&CreateBranches);
 
 sub GetDefaultBranch