Add token: 'type'
Add Type
Rename cstr to ctor