Added most DB handlers and code cleanup