Hopefully fixed database schema