Better context control