Updated paths throughout to use context variables.