Renamed views
Added unique client_id