Removed singletons and better imports.