Restructuring DB. Fixed Update functionality.