Implemented new class to handle new api response structure + minor changes