Fixing data mapping with new api