Do some cleanup
Add Parametric base token