Adapted to the new data query service and unit availability class.