Refactoring Argument interface and Argument classes provided by the core to comply with new Workspace system.