Minor Changes to DB Structure