Improved much database structure and sync everything