Updated API, added relations in the result