Update to newer database schema that should be significantly faster