Added database infrastructure