#186 Update to use new context type.