Add full db functionality