Refactored out exports to service object