modified the return value of findAll methods