Redid DB schema to simplify workflow