I added db stuffs