FORGE-1855: Support for Singleton Services