Fix #4, Alter the DB structure