Add parsing function directly to service, fixes #14