Updated XML mapping to handle <NoObject /> cases