upstream update provide findOne() to increase performance