Update proxies
Fix CS
Use short array notation
Add missing proxy and repository
Add token entities