Added ContextResources to SystemOptions and Tasks to FocusResources.