Improve database schema