Updated content models to use ObjectID