Added find and findAll