moved to better DB schema