Added parsing for types
renaming