Improve database structure