Updated DB model with slightly better associations