diff --git a/addon/initializers/ember-social-services.js b/addon/initializers/ember-social-services.js
index da1472c..4819d9f 100644
--- a/addon/initializers/ember-social-services.js
+++ b/addon/initializers/ember-social-services.js
@@ -1,6 +1,6 @@
 export default {
   name: 'ember-social-services',
-  initialize: function(container, application){
+  initialize: function(application){
     var facebookPluginComponents = ['facepile', 'like', 'share'];
 
     facebookPluginComponents.forEach(function(plugin) {
diff --git a/addon/services/facebook-api-client.js b/addon/services/facebook-api-client.js
index 826f67a..1848b8e 100644
--- a/addon/services/facebook-api-client.js
+++ b/addon/services/facebook-api-client.js
@@ -4,7 +4,7 @@ import Ember from 'ember';
 
 var facebookScriptPromise;
 
-export default Ember.Object.extend({
+export default Ember.Service.extend({
   /*
    * A tracking object implementing `shared(serviceName, payload)` and/or
    * `clicked(serviceName, payload)` can be set on this object, and will
diff --git a/addon/services/linkedin-api-client.js b/addon/services/linkedin-api-client.js
index 6879418..58d71f0 100644
--- a/addon/services/linkedin-api-client.js
+++ b/addon/services/linkedin-api-client.js
@@ -4,7 +4,7 @@ import Ember from 'ember';
 
 var linkedinScriptPromise;
 
-export default Ember.Object.extend({
+export default Ember.Service.extend({
   /*
    * A tracking object implementing `shared(serviceName, payload)` and/or
    * `clicked(serviceName, payload)` can be set on this object, and will
diff --git a/addon/services/twitter-api-client.js b/addon/services/twitter-api-client.js
index 46e5204..01d1674 100644
--- a/addon/services/twitter-api-client.js
+++ b/addon/services/twitter-api-client.js
@@ -4,7 +4,7 @@ import Ember from 'ember';
 
 var twitterScriptPromise;
 
-export default Ember.Object.extend({
+export default Ember.Service.extend({
   /*
    * A tracking object implementing `shared(serviceName, payload)` and/or
    * `clicked(serviceName, payload)` can be set on this object, and will