Update to Parsed Components

Fixes state saving and identity link problems