Feature #3942: Refactor singleton classes to objects in Extension