Introducing Singleton class
Improve detection classes
Switch to new Database class