diff --git a/Headers/Foundation/NSBackgroundActivityScheduler.h b/Headers/Foundation/NSBackgroundActivityScheduler.h
index 5cbbaf3ac..1f93db348 100644
--- a/Headers/Foundation/NSBackgroundActivityScheduler.h
+++ b/Headers/Foundation/NSBackgroundActivityScheduler.h
@@ -59,7 +59,9 @@ DEFINE_BLOCK_TYPE(GSScheduledBlock, void, NSBackgroundActivityCompletionHandler)
 @interface NSBackgroundActivityScheduler : NSObject
 {
   NSString *_identifier;
-  NSString *_qualityOfService;
+  NSQualityOfService _qualityOfService;
+  NSTimeInterval _interval;
+  NSTimeInterval _tolerance;
   BOOL _repeats;
   BOOL _shouldDefer;
 }
diff --git a/Source/NSBackgroundActivityScheduler.m b/Source/NSBackgroundActivityScheduler.m
index 158c222cf..edf0afd7e 100644
--- a/Source/NSBackgroundActivityScheduler.m
+++ b/Source/NSBackgroundActivityScheduler.m
@@ -28,54 +28,77 @@
 
 - (instancetype) initWithIdentifier: (NSString *)identifier
 {
+  self = [super init];
+  if(self != nil)
+    {
+      _identifier = identifier;
+      _qualityOfService = NSQualityOfServiceDefault;
+      _repeats = NO;
+      _interval = 0;
+      _tolerance = 0;
+      _shouldDefer = NO;
+    }
+  return self;
 }
 
 - (NSString *) identifier
 {
+  return _identifier;
 }
 
 - (void) setIdentifier: (NSString *)identifier
 {
+  ASSIGNCOPY(_identifier, identifier);
 }
 
 - (NSQualityOfService) qualityOfService
 {
+  return _qualityOfService;
 }
 
 - (void) setQualityOfService: (NSQualityOfService)qualityOfService
 {
+  _qualityOfService = qualityOfService;
 }
 
 - (BOOL) repeats
 {
+  return _repeats;
 }
 
 - (void) setRepeats: (BOOL)flag
 {
+  _repeats = flag;
 }
 
 - (NSTimeInterval) interval
 {
+  return _interval;
 }
 
 - (void) setInterval: (NSTimeInterval)interval
 {
+  _interval = interval;
 }
 
 - (NSTimeInterval) tolerance
 {
+  return _tolerance;
 }
 
-- (void) setTolerance: (NSTimeInterval)interval
+- (void) setTolerance: (NSTimeInterval)tolerance
 {
+  _tolerance = tolerance;
 }
 
 - (BOOL) shouldDefer
 {
+  return _shouldDefer;
 }
 
 - (void) setShouldDefer: (BOOL)flag
 {
+  _shouldDefer = flag;
 }
 
 - (void) scheduleWithBlock: (GSScheduledBlock)block