use _attributes_ instead of p_attributes to store varia attrs
Merge branch 'better-name'