Make context usage optional, and add a source without contexts