Added database handler and other classes