Renamed Class
Added keeping data for favorites