Rhqapi - added TODO