Modify the ParkingWrapper and the queries