Fix arrow alignment
Adapt all code to new packages data format