Added some db work