Fixing the scopes in chore model