@ab268  same here please: take a look at base.KatelloCliDataProvider and try to reuse the same logic in here.