Fix/attribute export