Added more fields to RAT/WASH