Feature tokenconfig

Merging new features into the main branch.