Updates for context api changes