Rework of Database