Refactor argument structure
Argument attributes
Fix attributes