Change Org spec to use Contexts