Support for findAll added