Remove hardcoded data types

Now we parse the data depending on its type.