Improve findAll method