Removed ArgumentType and added Argument back