Use Database as singleton
Merged controller