Add database
Fixes for PSR2 Standard