[#MTT-5] - Adapt to the new api structure