[Parser] Added proper type storage