added uuid + convert mongodb to expect an underlying singleton