Added database, revised DB model slightly