added findAll and findById methods