Use included Finders when possible to improve performance
Documented recent changes