Add contexts
Rename some set values
Update overview