Switched to classic db classes