Adds data type Argument and renames some methods