Modified DB schema to match our discussions