RF inventory support + missing api classes