Adds better DB wrapper
resolves conflicts