Fixing to have a better database schema