Added database and folder classes