[Update] Changed type names and parsing methods