Move the models under ndb to help identify what data store is being used
Move content records to using get_by_id vs a ndb query