Updated to get rid of [:ndb]