[BUGFIX] New DB Schema