Service Support Added

[lukegalea]

Hey there,

I've added service support in these commits. I changed the constructor a bit too, but you could revert that bit if you wanted to maintain backward compatibility.