DB class update - it works now with new database