Restored DB functionality