Adding Generic service support
Merge pull request #2 from ramielrowe/hackathon

Adding Generic service support