Updated specs and mongodb models to match new uid/id