Reorganized code (towards a Database object)
Database object added