Use new scoped context syntax