Change services to only use internal representation.

Fixes #23