[Parser] Changed way to store types (easy to verify code)