More compact data representation
Adapt to the new representation changes