#239

Checking object type in data tokens and casting where possible.