Fix for Database leaks - Singleton Pattern