Added basic db stuff