Add more fields to config. Simplify scopes