diff --git a/Alpha/Model/Object/ALPHAObjectModel.h b/Alpha/Model/Object/ALPHAObjectModel.h
index 465db4c..0e704b9 100644
--- a/Alpha/Model/Object/ALPHAObjectModel.h
+++ b/Alpha/Model/Object/ALPHAObjectModel.h
@@ -28,6 +28,11 @@
  */
 @property (nonatomic, copy) NSString *objectClass;
 
+/*!
+ *  Check is the object is the Class structure
+ */
+@property (nonatomic, readonly) BOOL objectIsClass;
+
 /*!
  *  Contains the class name of Apple superclass - usually NSObject, but can be array, set,
  *  or UIKit. Nil if class or metaclass. This is to ensure we can handle view controller
diff --git a/Alpha/Model/Object/ALPHAObjectModel.m b/Alpha/Model/Object/ALPHAObjectModel.m
index 4bc7fee..73af6a1 100644
--- a/Alpha/Model/Object/ALPHAObjectModel.m
+++ b/Alpha/Model/Object/ALPHAObjectModel.m
@@ -7,12 +7,15 @@
 //
 
 #import "ALPHAObjectModel.h"
+#import "ALPHARuntimeUtility.h"
 
 @implementation ALPHAObjectModel
 
 - (void)setObjectPointer:(NSString *)objectPointer
 {
     _objectPointer = objectPointer;
+    id<NSObject> object = [ALPHARuntimeUtility objectForPointerString:objectPointer className:nil];
+    self->_objectIsClass = [object class] == object;
     
     [self updateReferencesWithObjectPointer:objectPointer objectClass:nil];
 }
diff --git a/Alpha/Plugins/Global/Sources/ALPHAClassSource.m b/Alpha/Plugins/Global/Sources/ALPHAClassSource.m
index 58b4b76..6b71cbe 100644
--- a/Alpha/Plugins/Global/Sources/ALPHAClassSource.m
+++ b/Alpha/Plugins/Global/Sources/ALPHAClassSource.m
@@ -13,6 +13,7 @@
 #import "ALPHARuntimeUtility.h"
 
 #import "ALPHAClassSource.h"
+#import "ALPHAObjectSource.h"
 
 NSString* const ALPHAClassDataIdentifier = @"com.unifiedsense.alpha.data.class";
 NSString* const ALPHAClassBinaryParameterKey = @"kALPHAClassBinaryParameterKey";
@@ -56,7 +57,9 @@ - (ALPHAModel *)modelForRequest:(ALPHARequest *)request
     {
         ALPHAScreenItem* item = [[ALPHAScreenItem alloc] init];
         item.title = class;
-        item.object = NSClassFromString(class);
+        
+        ALPHARequest* request = [ALPHARequest requestForObject:NSClassFromString(class)];
+        item.object = request;
         
         [items addObject:item];
     }
diff --git a/Alpha/Plugins/Object/Converters/ALPHAObjectConverter.m b/Alpha/Plugins/Object/Converters/ALPHAObjectConverter.m
index 8a1a257..2d28193 100644
--- a/Alpha/Plugins/Object/Converters/ALPHAObjectConverter.m
+++ b/Alpha/Plugins/Object/Converters/ALPHAObjectConverter.m
@@ -24,298 +24,311 @@
 
 @implementation ALPHAObjectConverter
 
-- (BOOL)canConvertObject:(id)object
-{
-    return [object isKindOfClass:[ALPHAObjectModel class]];
+- (BOOL)canConvertObject:(id)object {
+   return [object isKindOfClass:[ALPHAObjectModel class]];
 }
 
-- (ALPHAScreenModel *)screenModelForObject:(ALPHAObjectModel *)object
-{
-    //
-    // This is an exception that we send an empty identifier. We will not reload the object.
-    //
-    //
-    ALPHATableScreenModel* model = [[ALPHATableScreenModel alloc] initWithRequest:object.request];
-    //model.title = [NSString stringWithFormat:@"Live Objects (%lu)", (unsigned long)totalCount];
-    model.title = object.objectClass;
-    
-    model.searchBarPlaceholder = @"Filter";
-    model.scopes = @[ @"No Inheritance", @"Include Inheritance" ];
-    
-    NSMutableArray* sections = [NSMutableArray array];
-    
-    //
-    // Add sections
-    //
-    
-    if (object.objectDescription)
-    {
-        [sections addObject:[self sectionForDescriptionWithModel:object]];
-    }
-    
-    ALPHAScreenSection *section = [self sectionForObjectTypeWithModel:object];
-    
-    if (section)
-    {
-        [sections addObject:section];
-    }
-    
-    [sections addObject:[self sectionForPropertyName:@"properties" inModel:object]];
-    [sections addObject:[self sectionForPropertyName:@"ivars" inModel:object]];
-    [sections addObject:[self sectionForPropertyName:@"methods" inModel:object]];
-    [sections addObject:[self sectionForPropertyName:@"classMethods" inModel:object]];
-    [sections addObject:[self sectionForPropertyName:@"superclasses" inModel:object]];
-    
-    if (!object.request.parameters[ALPHASearchTextParameterKey])
-    {
-        [sections addObject:[self sectionForObjectGraphWithObject:object]];
-    }
-    
-    model.sections = sections.copy;
-    
-    model.expiration = 60.0;
-    
-    return model;
+- (ALPHAScreenModel *)screenModelForObject:(ALPHAObjectModel *)object {
+   //
+   // This is an exception that we send an empty identifier. We will not reload
+   // the object.
+   //
+   //
+   ALPHATableScreenModel *model =
+      [[ALPHATableScreenModel alloc] initWithRequest:object.request];
+   // model.title = [NSString stringWithFormat:@"Live Objects (%lu)", (unsigned
+   // long)totalCount];
+   model.title = object.objectClass;
+
+   model.searchBarPlaceholder = @"Filter";
+   model.scopes = @[ @"No Inheritance", @"Include Inheritance" ];
+
+   NSMutableArray *sections = [NSMutableArray array];
+
+   //
+   // Add sections
+   //
+
+   if (object.objectDescription) {
+      [sections addObject:[self sectionForDescriptionWithModel:object]];
+   }
+
+   ALPHAScreenSection *section = [self sectionForObjectTypeWithModel:object];
+
+   if (section) {
+      [sections addObject:section];
+   }
+
+   [sections
+    addObject:[self sectionForPropertyName:@"properties" inModel:object]];
+   [sections addObject:[self sectionForPropertyName:@"ivars" inModel:object]];
+   [sections addObject:[self sectionForPropertyName:@"methods" inModel:object]];
+   [sections
+    addObject:[self sectionForPropertyName:@"classMethods" inModel:object]];
+   [sections
+    addObject:[self superclassesSectionForModel:object]];
+
+   if (!object.request.parameters[ALPHASearchTextParameterKey]) {
+      [sections addObject:[self sectionForObjectGraphWithObject:object]];
+   }
+
+   model.sections = sections.copy;
+
+   model.expiration = 60.0;
+
+   return model;
 }
 
-#pragma mark - Private methods
+#pragma mark - 
 
-- (ALPHAScreenSection *)sectionForPropertyName:(NSString *)property inModel:(ALPHAObjectModel *)model
-{
-    ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
-    
-    NSMutableArray *items = [NSMutableArray array];
-    
-    NSArray* array = [model valueForKey:property];
-    
-    section.headerText = [[property alpha_titleCaseForCamelCase] stringByAppendingFormat:@" (%ld)", (long)array.count];
-    
-    for (id object in array)
-    {
-        ALPHAScreenItem* item = [[ALPHAScreenItem alloc] init];
-        item.style = UITableViewCellStyleSubtitle;
-        
-        if ([object isKindOfClass:[ALPHAObjectProperty class]])
-        {
-            item.title = [object description];
-            item.detail = [ALPHARuntimeUtility descriptionForIvarOrPropertyValue:[(ALPHAObjectProperty *) object value]];
-
-        }
-        else if ([object isKindOfClass:[ALPHAObjectIvar class]])
-        {
-            item.title = [object prettyDescription];
-            item.detail = [ALPHARuntimeUtility descriptionForIvarOrPropertyValue:[(ALPHAObjectIvar *) object value]];
-        }
-        else if ([object isKindOfClass:[ALPHAObjectMethod class]])
-        {
-            item.title = [object prettyDescription];
-        }
-        else
-        {
-            item.title = [object description];
-        }
-        
-        item.object = object;
-        
-        [items addObject:item];
+-(ALPHAScreenSection*)superclassesSectionForModel:(ALPHAObjectModel*)model{
+    ALPHAScreenSection* section = [self sectionForPropertyName:@"superclasses" inModel:model];
+    for (ALPHAScreenItem* screenItem in section.items) {
+        NSString* classString = screenItem.object;
+        Class classObject = NSClassFromString(classString);
+        ALPHARequest* request = [ALPHARequest requestForObject:classObject];
+        screenItem.object = request;
     }
-    
-    section.items = items.copy;
-    
     return section;
 }
 
-- (ALPHAScreenSection *)sectionForDescriptionWithModel:(ALPHAObjectModel *)model
-{
-    ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
-    section.headerText = @"Description";
-    
-    ALPHAScreenItem *item = [[ALPHAScreenItem alloc] init];
-    item.title = model.objectDescription;
-    
-    section.items = @[ item ];
-    
-    return section;
+#pragma mark - Private methods
+
+- (ALPHAScreenSection *)sectionForPropertyName:(NSString *)property inModel:(ALPHAObjectModel *)model {
+   ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
+
+   NSMutableArray *items = [NSMutableArray array];
+
+   NSArray *array = [model valueForKey:property];
+
+   section.headerText = [[property alpha_titleCaseForCamelCase]
+                         stringByAppendingFormat:@" (%ld)", (long)array.count];
+
+   for (id object in array) {
+      ALPHAScreenItem *item = [[ALPHAScreenItem alloc] init];
+      item.style = UITableViewCellStyleSubtitle;
 
+      if ([object isKindOfClass:[ALPHAObjectProperty class]]) {
+         item.title = [object description];
+         item.detail = [ALPHARuntimeUtility
+                        descriptionForIvarOrPropertyValue:[(ALPHAObjectProperty *)
+                                                           object value]];
+      } else if ([object isKindOfClass:[ALPHAObjectIvar class]]) {
+         item.title = [object prettyDescription];
+         item.detail = [ALPHARuntimeUtility
+                        descriptionForIvarOrPropertyValue:[(ALPHAObjectIvar *)object value]];
+      } else if ([object isKindOfClass:[ALPHAObjectMethod class]]) {
+         item.title = [object prettyDescription];
+      } else {
+         item.title = [object description];
+      }
+
+      // Ignore object for some kinds of object values e.g. properties, methods,
+      // ivars for Class objects.
+      BOOL shouldIgnoreObject = NO;
+      if (model.objectIsClass &&
+          ([object isKindOfClass:[ALPHAObjectProperty class]] ||
+           [object isKindOfClass:[ALPHAObjectIvar class]] ||
+           ([object isKindOfClass:[ALPHAObjectMethod class]] &&
+            ![(ALPHAObjectMethod *)object isClassMethod]))) {
+         shouldIgnoreObject = YES;
+      }
+      if (!shouldIgnoreObject) {
+         item.object = object;
+      }
+
+      [items addObject:item];
+   }
+
+   section.items = items.copy;
+
+   return section;
 }
 
-- (ALPHAScreenSection *)sectionForObjectTypeWithModel:(ALPHAObjectModel *)model
-{
-    //
-    // If we have object content, build section from it.
-    //
-    
-    NSMutableArray *items = [NSMutableArray array];
-    
-    Class class = NSClassFromString(model.objectMainSuperclass);
-    
-    ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
-    
-    section.headerText = [self headerStringForClass:class];
-    
-    if (model.objectContent)
-    {
-        for (ALPHAObjectElement *item in model.objectContent.items)
-        {
-            ALPHAScreenItem *screenItem = [[ALPHAScreenItem alloc] init];
-            
-            screenItem.title = item.name;
-            screenItem.detail = item.objectClass;
-            
-            screenItem.object = [ALPHARequest requestForObjectPointer:item.objectPointer className:item.objectClass];
-        }
-        
-        section.items = items.copy;
-        
-        return section;
-    }
-    
-    //
-    // This represents specific object types and can add a special section, such as Array, Set, View,
-    // Layer, etc. Equals to custom section on ALPHAObjectExplorerViewController
-    //
-    
-    //
-    // Currently handled specific Foundation objects to add shortcuts that the original code had.
-    // - UIViewController
-    // - UIView
-    // - CALayer
-    // - Class
-    //
-    
-    NSArray *shortcuts = [self shortcutsForClass:class];
-    
-    if (shortcuts)
-    {
-        [items addObjectsFromArray:shortcuts];
-    }
-    
-    //
-    // Return section if we have a title
-    //
-    
-    if (section.headerText)
-    {
-        section.items = items.copy;
-        
-        return section;
-    }
-    
-    return nil;
+- (ALPHAScreenSection *)sectionForDescriptionWithModel:(ALPHAObjectModel *)model {
+   ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
+   section.headerText = @"Description";
+
+   ALPHAScreenItem *item = [[ALPHAScreenItem alloc] init];
+   item.title = model.objectDescription;
+
+   section.items = @[ item ];
+
+   return section;
 }
 
-- (NSString *)headerStringForClass:(Class)class
-{
-    if (class == [NSObject class])
-    {
-        return nil;
-    }
-    
-    if (class == [NSArray class] || class == [NSMutableArray class])
-    {
-        return @"Array Indices";
-    }
-    
-    if (class == [NSDictionary class] || class == [NSMutableDictionary class])
-    {
-        return @"Dictionary Objects";
-    }
-    
-    if (class == [NSUserDefaults class])
-    {
-        return @"Defaults";
-    }
-    
-    // Class instances, UIViewController, UIView, CALayer have shortcuts
-    return @"Shortcuts";
+- (ALPHAScreenSection *)sectionForObjectTypeWithModel:(ALPHAObjectModel *)model {
+   //
+   // If we have object content, build section from it.
+   //
+
+   NSMutableArray *items = [NSMutableArray array];
+
+   Class class = NSClassFromString(model.objectMainSuperclass);
+
+   ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
+
+   section.headerText = [self headerStringForClass:class];
+
+   if (model.objectContent) {
+      for (ALPHAObjectElement *item in model.objectContent.items) {
+         ALPHAScreenItem *screenItem = [[ALPHAScreenItem alloc] init];
+
+         screenItem.title = item.name;
+         screenItem.detail = item.objectClass;
+
+         screenItem.object =
+            [ALPHARequest requestForObjectPointer:item.objectPointer
+             className:item.objectClass];
+      }
+
+      section.items = items.copy;
+
+      return section;
+   }
+
+   //
+   // This represents specific object types and can add a special section, such
+   // as Array, Set, View,
+   // Layer, etc. Equals to custom section on ALPHAObjectExplorerViewController
+   //
+
+   //
+   // Currently handled specific Foundation objects to add shortcuts that the
+   // original code had.
+   // - UIViewController
+   // - UIView
+   // - CALayer
+   // - Class
+   //
+
+   NSArray *shortcuts = [self shortcutsForClass:class];
+   ALPHAScreenItem *liveInstancesShortcut =
+      [self liveInstancesShortcutForClass:NSClassFromString(model.objectClass)];
+   shortcuts = [shortcuts arrayByAddingObject:liveInstancesShortcut];
+
+   if (shortcuts) {
+      [items addObjectsFromArray:shortcuts];
+   }
+
+   //
+   // Return section if we have a title
+   //
+
+   if (section.headerText) {
+      section.items = items.copy;
+
+      return section;
+   }
+
+   return nil;
 }
 
-- (NSArray *)shortcutsForClass:(Class)class
-{
-    if (class == [NSObject class])
-    {
-        return nil;
-    }
-    
-    NSMutableArray *items = [NSMutableArray array];
-    
-    ALPHAScreenItem *item = nil;
-    
-    if (class == [UIViewController class])
-    {
-        item = [[ALPHAScreenItem alloc] init];
-        item.title = @"Push View Controller";
-        
-        [items addObject:item];
-        
-        item = [[ALPHAScreenItem alloc] init];
-        item.title = @"@property UIView *view";
-        
-        [items addObject:item];
-    }
-    else if (class == [UIView class])
-    {
-        item = [[ALPHAScreenItem alloc] init];
-        item.title = @"View Controller";
-        
-        [items addObject:item];
-        
-        item = [[ALPHAScreenItem alloc] init];
-        item.title = @"Preview Image";
-        
-        [items addObject:item];
-    }
-    else if (class == [CALayer class])
-    {
-        item = [[ALPHAScreenItem alloc] init];
-        item.title = @"Preview Image";
-        
-        [items addObject:item];
-    }
-    else
-    {
-        item = [[ALPHAScreenItem alloc] init];
-        item.title = @"Live Instances";
-        item.object = [ALPHARequest requestWithIdentifier:ALPHAInstanceDataIdentifier parameters:@{ ALPHAInstanceDataClassNameIdentifier : NSStringFromClass(class) }];
-        
-        [items addObject:item];
-    }
+- (NSString *)headerStringForClass:(Class) class {
+   if (class == [NSObject class]) {
+      return nil;
+   }
+
+   if (class == [NSArray class] || class == [NSMutableArray class]) {
+      return @"Array Indices";
+   }
 
-    return items.copy;
+   if (class == [NSDictionary class] || class == [NSMutableDictionary class]) {
+      return @"Dictionary Objects";
+   }
+
+   if (class == [NSUserDefaults class]) {
+      return @"Defaults";
+   }
+
+   // Class instances, UIViewController, UIView, CALayer have shortcuts
+   return @"Shortcuts";
 }
 
-- (ALPHAScreenSection *)sectionForObjectGraphWithObject:(ALPHAObjectModel *)object
-{
-    ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
-    section.headerText = @"Object Graph";
-    
-    ALPHAScreenItem *item = [[ALPHAScreenItem alloc] init];
-    item.title = @"Other objects with ivars referencing this object";
-    item.object = [ALPHARequest requestWithIdentifier:ALPHAInstanceDataIdentifier parameters:@{ ALPHAInstanceDataClassNameIdentifier : object.objectClass, ALPHAInstanceDataReferenceObjectIdentifier : object.objectPointer }];
-    
-    section.items = @[ item ];
-    
-    return section;
+- (NSArray *)shortcutsForClass : (Class) class {
+   if (class == [NSObject class] || class == NULL) {
+      return @[];
+   }
+
+   NSMutableArray *items = [NSMutableArray array];
+
+   ALPHAScreenItem *item = nil;
+
+   if (class == [UIViewController class]) {
+      item = [[ALPHAScreenItem alloc] init];
+      item.title = @"Push View Controller";
+
+      [items addObject:item];
+
+      item = [[ALPHAScreenItem alloc] init];
+      item.title = @"@property UIView *view";
+
+      [items addObject:item];
+   } else if (class == [UIView class]) {
+      item = [[ALPHAScreenItem alloc] init];
+      item.title = @"View Controller";
+
+      [items addObject:item];
+
+      item = [[ALPHAScreenItem alloc] init];
+      item.title = @"Preview Image";
+
+      [items addObject:item];
+   } else if (class == [CALayer class]) {
+      item = [[ALPHAScreenItem alloc] init];
+      item.title = @"Preview Image";
+
+      [items addObject:item];
+   }
+
+   return items.copy;
+}
+
+- (ALPHAScreenItem *)liveInstancesShortcutForClass : (Class) class {
+   BOOL isMeta = class_isMetaClass(class);
+   ALPHAScreenItem *item = [[ALPHAScreenItem alloc] init];
+   item.title = @"Live Instances";
+   item.object =
+      [ALPHARequest requestWithIdentifier:ALPHAInstanceDataIdentifier
+       parameters:@{
+          ALPHAInstanceDataClassNameIdentifier :
+          NSStringFromClass(class)
+       }];
+
+   return item;
+}
+
+- (ALPHAScreenSection *)sectionForObjectGraphWithObject: (ALPHAObjectModel *)object {
+   ALPHAScreenSection *section = [[ALPHAScreenSection alloc] init];
+   section.headerText = @"Object Graph";
+
+   ALPHAScreenItem *item = [[ALPHAScreenItem alloc] init];
+   item.title = @"Other objects with ivars referencing this object";
+   item.object = [ALPHARequest
+                  requestWithIdentifier:ALPHAInstanceDataIdentifier
+                  parameters:@{
+                     ALPHAInstanceDataClassNameIdentifier : object.objectClass,
+                     ALPHAInstanceDataReferenceObjectIdentifier :
+                     object.objectPointer
+                  }];
+
+   section.items = @[ item ];
+
+   return section;
 }
 
 #pragma mark - Render class
 
-- (Class)renderClassForObject:(id)object
-{
-    if ([object isKindOfClass:[ALPHAObjectMethod class]])
-    {
-        return [ALPHAMethodRendererViewController class];
-    }
-    else if ([object isKindOfClass:[ALPHAObjectProperty class]])
-    {
-        return [ALPHAPropertyRendererViewController class];
-    }
-    else if ([object isKindOfClass:[ALPHAObjectIvar class]])
-    {
-        return [ALPHAIvarRendererViewController class];
-    }
-    
-    return nil;
+- (Class)renderClassForObject:(id)object {
+   if ([object isKindOfClass:[ALPHAObjectMethod class]]) {
+      return [ALPHAMethodRendererViewController class];
+   } else if ([object isKindOfClass:[ALPHAObjectProperty class]]) {
+      return [ALPHAPropertyRendererViewController class];
+   } else if ([object isKindOfClass:[ALPHAObjectIvar class]]) {
+      return [ALPHAIvarRendererViewController class];
+   }
+
+   return nil;
 }
 
 @end