added database handler