diff --git a/MacPass/KPKEntry+MPCustomAttributeProperties.h b/MacPass/KPKEntry+MPCustomAttributeProperties.h
new file mode 100644
index 00000000..8649a078
--- /dev/null
+++ b/MacPass/KPKEntry+MPCustomAttributeProperties.h
@@ -0,0 +1,13 @@
+//
+//  KPKEntry+MPCustomAttributeProperties.h
+//  MacPass
+//
+//  Created by Michael Starke on 03.09.18.
+//  Copyright © 2018 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <KeePassKit/KeePassKit.h>
+
+@interface KPKEntry (MPCustomAttributeProperties)
+
+@end
diff --git a/MacPass/KPKEntry+MPCustomAttributeProperties.m b/MacPass/KPKEntry+MPCustomAttributeProperties.m
new file mode 100644
index 00000000..85a6a602
--- /dev/null
+++ b/MacPass/KPKEntry+MPCustomAttributeProperties.m
@@ -0,0 +1,13 @@
+//
+//  KPKEntry+MPCustomAttributeProperties.m
+//  MacPass
+//
+//  Created by Michael Starke on 03.09.18.
+//  Copyright © 2018 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "KPKEntry+MPCustomAttributeProperties.h"
+
+@implementation KPKEntry (MPCustomAttributeProperties)
+
+@end
diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m
index 7e9cfadc..150b65ca 100644
--- a/MacPass/MPEntryInspectorViewController.m
+++ b/MacPass/MPEntryInspectorViewController.m
@@ -112,7 +112,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
 }
 
 - (KPKEntry *)representedEntry {
-  if([self.representedObject isKindOfClass:[KPKEntry class]]) {
+  if([self.representedObject isKindOfClass:KPKEntry.class]) {
     return self.representedObject;
   }
   return nil;
@@ -127,7 +127,7 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) {
   [self.tabView bind:NSSelectedIndexBinding toObject:self withKeyPath:NSStringFromSelector(@selector(activeTab)) options:nil];
   
   
-  self.attachmentTableView.backgroundColor = [NSColor clearColor];
+  self.attachmentTableView.backgroundColor = NSColor.clearColor;
   [self.attachmentTableView bind:NSContentBinding toObject:_attachmentsController withKeyPath:NSStringFromSelector(@selector(arrangedObjects)) options:nil];
   self.attachmentTableView.delegate = _attachmentTableDelegate;
   self.attachmentTableView.dataSource = _attachmentDataSource;