Tweaking service provider.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Added foreign keys to schema. Is this a good idea?
Revert "Added foreign keys to schema. Is this a good idea?"

This reverts commit bba899207509916251ce8fafa1c3f2eedbcd7d1b.