#112 | Removing arguments class