Rework Arguments class