Support for ->find(...) method. Tweaks and update.